diff --git a/app/rainloop/v/1.16.0/app/handle.php b/app/rainloop/v/1.16.0/app/handle.php index 6113ef86bffcd7a3e655f280f121a95b81a39c9f..52c266040878300c1ee7eccb6e115c0bcad23dab 100644 --- a/app/rainloop/v/1.16.0/app/handle.php +++ b/app/rainloop/v/1.16.0/app/handle.php @@ -83,17 +83,17 @@ if (\class_exists('RainLoop\Api')) { \define('APP_API_STARTED', true); - \RainLoop\Api::Handle(); + \RainLoopOld\Api::Handle(); } } else if (!\defined('APP_STARTED')) { \define('APP_STARTED', true); - \RainLoop\Api::Handle(); - \RainLoop\Service::Handle(); + \RainLoopOld\Api::Handle(); + \RainLoopOld\Service::Handle(); - \RainLoop\Api::ExitOnEnd(); + \RainLoopOld\Api::ExitOnEnd(); } } } diff --git a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Settings.php b/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Settings.php deleted file mode 100644 index bddff7cfd142d40ed97534099af133402e931769..0000000000000000000000000000000000000000 --- a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Settings.php +++ /dev/null @@ -1,52 +0,0 @@ -oDriver = $oDriver; - } - - /** - * @param \RainLoop\Model\Account $oAccount - * - * @return \RainLoop\Settings - */ - public function Load(\RainLoop\Model\Account $oAccount) - { - $oSettings = new \RainLoop\Settings(); - $oSettings->InitData($this->oDriver->Load($oAccount)); - return $oSettings; - } - - /** - * @param \RainLoop\Model\Account $oAccount - * @param \RainLoop\Settings $oSettings - * - * @return bool - */ - public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) - { - return $this->oDriver->Save($oAccount, $oSettings->DataAsArray()); - } - - /** - * @return bool - */ - public function IsActive() - { - return $this->oDriver instanceof \RainLoop\Providers\Settings\ISettings; - } -} diff --git a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Actions.php b/app/rainloop/v/1.16.0/app/libraries/RainLoopOld/Actions.php similarity index 88% rename from app/rainloop/v/1.16.0/app/libraries/RainLoop/Actions.php rename to app/rainloop/v/1.16.0/app/libraries/RainLoopOld/Actions.php index c2f1b9b7bf1e9565366b6e13190796097ed44fc8..7a51ad49bb4390ff181312b5f53ad06a4ae8bba8 100644 --- a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Actions.php +++ b/app/rainloop/v/1.16.0/app/libraries/RainLoopOld/Actions.php @@ -32,7 +32,7 @@ class Actions private $oMailClient; /** - * @var \RainLoop\Plugins\Manager + * @var\RainLoopOld\Plugins\Manager */ private $oPlugins; @@ -47,7 +47,7 @@ class Actions private $oLoggerAuth; /** - * @var \RainLoop\Social + * @var\RainLoopOld\Social */ private $oSocial; @@ -57,67 +57,67 @@ class Actions private $aCachers; /** - * @var \RainLoop\Providers\Storage + * @var\RainLoopOld\Providers\Storage */ private $oStorageProvider; /** - * @var \RainLoop\Providers\Storage + * @var\RainLoopOld\Providers\Storage */ private $oLocalStorageProvider; /** - * @var \RainLoop\Providers\Files + * @var\RainLoopOld\Providers\Files */ private $oFilesProvider; /** - * @var \RainLoop\Providers\Domain + * @var\RainLoopOld\Providers\Domain */ private $oDomainProvider; /** - * @var \RainLoop\Providers\Settings + * @var\RainLoopOld\Providers\Settings */ private $oSettingsProvider; /** - * @var \RainLoop\Providers\Settings + * @var\RainLoopOld\Providers\Settings */ private $oLocalSettingsProvider; /** - * @var \RainLoop\Providers\Filters + * @var\RainLoopOld\Providers\Filters */ private $oFiltersProvider; /** - * @var \RainLoop\Providers\AddressBook + * @var\RainLoopOld\Providers\AddressBook */ private $oAddressBookProvider; /** - * @var \RainLoop\Providers\Suggestions + * @var\RainLoopOld\Providers\Suggestions */ private $oSuggestionsProvider; /** - * @var \RainLoop\Providers\ChangePassword + * @var\RainLoopOld\Providers\ChangePassword */ private $oChangePasswordProvider; /** - * @var \RainLoop\Providers\TwoFactorAuth + * @var\RainLoopOld\Providers\TwoFactorAuth */ private $oTwoFactorAuthProvider; /** - * @var \RainLoop\Providers\Prem + * @var\RainLoopOld\Providers\Prem */ private $oPremProvider; /** - * @var \RainLoop\Config\Application + * @var\RainLoopOld\Config\Application */ private $oConfig; @@ -170,7 +170,7 @@ class Actions } /** - * @return \RainLoop\Actions + * @return\RainLoopOld\Actions */ public static function NewInstance() { @@ -180,7 +180,7 @@ class Actions /** * @param string $sSpecAuthToken * - * @return \RainLoop\Application + * @return\RainLoopOld\Application */ public function SetSpecAuthToken($sSpecAuthToken) { @@ -192,7 +192,7 @@ class Actions /** * @param string $sUpdateAuthToken * - * @return \RainLoop\Application + * @return\RainLoopOld\Application */ public function SetUpdateAuthToken($sUpdateAuthToken) { @@ -204,7 +204,7 @@ class Actions /** * @param string $bIsAjax * - * @return \RainLoop\Application + * @return\RainLoopOld\Application */ public function SetIsAjax($bIsAjax) { @@ -242,24 +242,24 @@ class Actions */ public function GetShortLifeSpecAuthToken($iLife = 60) { - $aAccountHash = \RainLoop\Utils::DecodeKeyValues($this->getLocalAuthToken()); + $aAccountHash =\RainLoopOld\Utils::DecodeKeyValues($this->getLocalAuthToken()); if (!empty($aAccountHash[0]) && 'token' === $aAccountHash[0] && \is_array($aAccountHash)) { $aAccountHash[10] = \time() + $iLife; - return \RainLoop\Utils::EncodeKeyValues($aAccountHash); + return\RainLoopOld\Utils::EncodeKeyValues($aAccountHash); } return ''; } /** - * @return \RainLoop\Application + * @return\RainLoopOld\Application */ public function Config() { if (null === $this->oConfig) { - $this->oConfig = new \RainLoop\Config\Application(); + $this->oConfig = new\RainLoopOld\Config\Application(); if (!$this->oConfig->Load()) { usleep(10000); @@ -287,7 +287,7 @@ class Actions /** * @param string $sName - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * * @return mixed */ @@ -305,36 +305,36 @@ class Actions { case 'files': // RainLoop\Providers\Files\IFiles - $mResult = new \RainLoop\Providers\Files\FileStorage(R_APP_PRIVATE_DATA.'storage/files'); + $mResult = new\RainLoopOld\Providers\Files\FileStorage(R_APP_PRIVATE_DATA.'storage/files'); break; case 'storage': case 'storage-local': // RainLoop\Providers\Storage\IStorage - $mResult = new \RainLoop\Providers\Storage\FileStorage( + $mResult = new\RainLoopOld\Providers\Storage\FileStorage( R_APP_PRIVATE_DATA.'storage', 'storage-local' === $sName); break; case 'settings': case 'settings-local': // RainLoop\Providers\Settings\ISettings - $mResult = new \RainLoop\Providers\Settings\DefaultSettings( + $mResult = new\RainLoopOld\Providers\Settings\DefaultSettings( $this->StorageProvider('settings-local' === $sName)); break; case 'login': - // \RainLoop\Providers\Login\LoginInterface - $mResult = new \RainLoop\Providers\Login\DefaultLogin(); + //\RainLoopOld\Providers\Login\LoginInterface + $mResult = new\RainLoopOld\Providers\Login\DefaultLogin(); break; case 'domain': - // \RainLoop\Providers\Domain\DomainAdminInterface - $mResult = new \RainLoop\Providers\Domain\DefaultDomain(R_APP_PRIVATE_DATA.'domains', $this->Cacher()); + //\RainLoopOld\Providers\Domain\DomainAdminInterface + $mResult = new\RainLoopOld\Providers\Domain\DefaultDomain(R_APP_PRIVATE_DATA.'domains', $this->Cacher()); break; case 'filters': - // \RainLoop\Providers\Filters\FiltersInterface - $mResult = new \RainLoop\Providers\Filters\SieveStorage( + //\RainLoopOld\Providers\Filters\FiltersInterface + $mResult = new\RainLoopOld\Providers\Filters\SieveStorage( $this->Plugins(), $this->Config() ); break; case 'address-book': - // \RainLoop\Providers\AddressBook\AddressBookInterface + //\RainLoopOld\Providers\AddressBook\AddressBookInterface $sDsn = \trim($this->Config()->Get('contacts', 'pdo_dsn', '')); $sUser = \trim($this->Config()->Get('contacts', 'pdo_user', '')); @@ -343,12 +343,12 @@ class Actions $sDsnType = $this->ValidateContactPdoType(\trim($this->Config()->Get('contacts', 'type', 'sqlite'))); if ('sqlite' === $sDsnType) { - $mResult = new \RainLoop\Providers\AddressBook\PdoAddressBook( + $mResult = new\RainLoopOld\Providers\AddressBook\PdoAddressBook( 'sqlite:'.R_APP_PRIVATE_DATA.'AddressBook.sqlite', '', '', 'sqlite'); } else { - $mResult = new \RainLoop\Providers\AddressBook\PdoAddressBook($sDsn, $sUser, $sPassword, $sDsnType); + $mResult = new\RainLoopOld\Providers\AddressBook\PdoAddressBook($sDsn, $sUser, $sPassword, $sDsnType); } break; case 'suggestions': @@ -358,19 +358,19 @@ class Actions $mResult = array(); } - if (\is_array($mResult) && \RainLoop\Utils::IsOwnCloud() && $this->Config()->Get('labs', 'owncloud_suggestions', true)) + if (\is_array($mResult) &&\RainLoopOld\Utils::IsOwnCloud() && $this->Config()->Get('labs', 'owncloud_suggestions', true)) { - // \RainLoop\Providers\Suggestions\ISuggestions - $mResult[] = new \RainLoop\Providers\Suggestions\OwnCloudSuggestions(); + //\RainLoopOld\Providers\Suggestions\ISuggestions + $mResult[] = new\RainLoopOld\Providers\Suggestions\OwnCloudSuggestions(); } break; case 'change-password': - // \RainLoop\Providers\ChangePassword\ChangePasswordInterface + //\RainLoopOld\Providers\ChangePassword\ChangePasswordInterface break; case 'two-factor-auth': - // \RainLoop\Providers\TwoFactorAuth\TwoFactorAuthInterface - $mResult = new \RainLoop\Providers\TwoFactorAuth\GoogleTwoFactorAuth(); + //\RainLoopOld\Providers\TwoFactorAuth\TwoFactorAuthInterface + $mResult = new\RainLoopOld\Providers\TwoFactorAuth\GoogleTwoFactorAuth(); break; } } @@ -445,7 +445,7 @@ class Actions /** * @param string $sLine - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * @param bool $bUrlEncode = false * @param array $aAdditionalParams = array() * @@ -459,7 +459,7 @@ class Actions { $sTimeOffset = (string) $this->Config()->Get('logs', 'time_offset', '0'); $sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) use ($sTimeOffset, $bUrlEncode) { - return \RainLoop\Utils::UrlEncode(\MailSo\Log\Logger::DateHelper($aMatch[1], $sTimeOffset), $bUrlEncode); + return\RainLoopOld\Utils::UrlEncode(\MailSo\Log\Logger::DateHelper($aMatch[1], $sTimeOffset), $bUrlEncode); }, $sLine); $aClear['/\{date:([^}]*)\}/'] = 'date'; @@ -475,13 +475,13 @@ class Actions if ($oAccount) { - $sLine = \str_replace('{imap:login}', \RainLoop\Utils::UrlEncode($oAccount->IncLogin(), $bUrlEncode), $sLine); - $sLine = \str_replace('{imap:host}', \RainLoop\Utils::UrlEncode($oAccount->DomainIncHost(), $bUrlEncode), $sLine); - $sLine = \str_replace('{imap:port}', \RainLoop\Utils::UrlEncode($oAccount->DomainIncPort(), $bUrlEncode), $sLine); + $sLine = \str_replace('{imap:login}',\RainLoopOld\Utils::UrlEncode($oAccount->IncLogin(), $bUrlEncode), $sLine); + $sLine = \str_replace('{imap:host}',\RainLoopOld\Utils::UrlEncode($oAccount->DomainIncHost(), $bUrlEncode), $sLine); + $sLine = \str_replace('{imap:port}',\RainLoopOld\Utils::UrlEncode($oAccount->DomainIncPort(), $bUrlEncode), $sLine); - $sLine = \str_replace('{smtp:login}', \RainLoop\Utils::UrlEncode($oAccount->OutLogin(), $bUrlEncode), $sLine); - $sLine = \str_replace('{smtp:host}', \RainLoop\Utils::UrlEncode($oAccount->DomainOutHost(), $bUrlEncode), $sLine); - $sLine = \str_replace('{smtp:port}', \RainLoop\Utils::UrlEncode($oAccount->DomainOutPort(), $bUrlEncode), $sLine); + $sLine = \str_replace('{smtp:login}',\RainLoopOld\Utils::UrlEncode($oAccount->OutLogin(), $bUrlEncode), $sLine); + $sLine = \str_replace('{smtp:host}',\RainLoopOld\Utils::UrlEncode($oAccount->DomainOutHost(), $bUrlEncode), $sLine); + $sLine = \str_replace('{smtp:port}',\RainLoopOld\Utils::UrlEncode($oAccount->DomainOutPort(), $bUrlEncode), $sLine); } $aClear['/\{imap:([^}]*)\}/i'] = 'imap'; @@ -492,20 +492,20 @@ class Actions { if (false !== \strpos($sLine, '{request:ip}')) { - $sLine = \str_replace('{request:ip}', \RainLoop\Utils::UrlEncode($this->Http()->GetClientIp( + $sLine = \str_replace('{request:ip}',\RainLoopOld\Utils::UrlEncode($this->Http()->GetClientIp( $this->Config()->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine); } if (false !== \strpos($sLine, '{request:domain}')) { $sLine = \str_replace('{request:domain}', - \RainLoop\Utils::UrlEncode($this->Http()->GetHost(false, true, true), $bUrlEncode), $sLine); + \RainLoopOld\Utils::UrlEncode($this->Http()->GetHost(false, true, true), $bUrlEncode), $sLine); } if (false !== \strpos($sLine, '{request:domain-clear}')) { $sLine = \str_replace('{request:domain-clear}', - \RainLoop\Utils::UrlEncode( + \RainLoopOld\Utils::UrlEncode( \MailSo\Base\Utils::GetClearDomainName($this->Http()->GetHost(false, true, true)), $bUrlEncode), $sLine); } @@ -517,7 +517,7 @@ class Actions if (false !== \strpos($sLine, '{user:uid}')) { $sLine = \str_replace('{user:uid}', - \RainLoop\Utils::UrlEncode(\base_convert(\sprintf('%u', + \RainLoopOld\Utils::UrlEncode(\base_convert(\sprintf('%u', \crc32(\md5(\RainLoop\Utils::GetConnectionToken()))), 10, 32), $bUrlEncode), $sLine ); @@ -525,7 +525,7 @@ class Actions if (false !== \strpos($sLine, '{user:ip}')) { - $sLine = \str_replace('{user:ip}', \RainLoop\Utils::UrlEncode($this->Http()->GetClientIp( + $sLine = \str_replace('{user:ip}',\RainLoopOld\Utils::UrlEncode($this->Http()->GetClientIp( $this->Config()->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine); } @@ -541,12 +541,12 @@ class Actions { $sEmail = $oAccount->Email(); - $sLine = \str_replace('{user:email}', \RainLoop\Utils::UrlEncode($sEmail, $bUrlEncode), $sLine); - $sLine = \str_replace('{user:login}', \RainLoop\Utils::UrlEncode( + $sLine = \str_replace('{user:email}',\RainLoopOld\Utils::UrlEncode($sEmail, $bUrlEncode), $sLine); + $sLine = \str_replace('{user:login}',\RainLoopOld\Utils::UrlEncode( \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $bUrlEncode), $sLine); - $sLine = \str_replace('{user:domain}', \RainLoop\Utils::UrlEncode( + $sLine = \str_replace('{user:domain}',\RainLoopOld\Utils::UrlEncode( \MailSo\Base\Utils::GetDomainFromEmail($sEmail), $bUrlEncode), $sLine); - $sLine = \str_replace('{user:domain-clear}', \RainLoop\Utils::UrlEncode( + $sLine = \str_replace('{user:domain-clear}',\RainLoopOld\Utils::UrlEncode( \MailSo\Base\Utils::GetClearDomainName( \MailSo\Base\Utils::GetDomainFromEmail($sEmail)), $bUrlEncode), $sLine); } @@ -614,11 +614,11 @@ class Actions public function SetAuthLogoutToken() { @\header('X-RainLoop-Action: Logout'); - \RainLoop\Utils::SetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, \md5(APP_START_TIME), 0); + \RainLoopOld\Utils::SetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, \md5(APP_START_TIME), 0); } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return void */ @@ -629,21 +629,21 @@ class Actions $sSpecAuthToken = '_'.$oAccount->GetAuthTokenQ(); $this->SetSpecAuthToken($sSpecAuthToken); - \RainLoop\Utils::SetCookie(self::AUTH_SPEC_TOKEN_KEY, $sSpecAuthToken, 0); + \RainLoopOld\Utils::SetCookie(self::AUTH_SPEC_TOKEN_KEY, $sSpecAuthToken, 0); if ($oAccount->SignMe() && 0 < \strlen($oAccount->SignMeToken())) { - \RainLoop\Utils::SetCookie(self::AUTH_SIGN_ME_TOKEN_KEY, - \RainLoop\Utils::EncodeKeyValuesQ(array( + \RainLoopOld\Utils::SetCookie(self::AUTH_SIGN_ME_TOKEN_KEY, + \RainLoopOld\Utils::EncodeKeyValuesQ(array( 'e' => $oAccount->Email(), 't' => $oAccount->SignMeToken() )), \time() + 60 * 60 * 24 * 30); $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'sign_me', - \RainLoop\Utils::EncodeKeyValuesQ(array( + \RainLoopOld\Utils::EncodeKeyValuesQ(array( 'Time' => \time(), 'AuthToken' => $oAccount->GetAuthTokenQ(), 'SignMetToken' => $oAccount->SignMeToken() @@ -658,10 +658,10 @@ class Actions */ public function GetSpecAuthTokenWithDeletion() { - $sResult = \RainLoop\Utils::GetCookie(self::AUTH_SPEC_TOKEN_KEY, ''); + $sResult =\RainLoopOld\Utils::GetCookie(self::AUTH_SPEC_TOKEN_KEY, ''); if (0 < strlen($sResult)) { - \RainLoop\Utils::ClearCookie(self::AUTH_SPEC_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(self::AUTH_SPEC_TOKEN_KEY); } return $sResult; @@ -672,10 +672,10 @@ class Actions */ public function GetSpecAuthLogoutTokenWithDeletion() { - $sResult = \RainLoop\Utils::GetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, ''); + $sResult =\RainLoopOld\Utils::GetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, ''); if (0 < strlen($sResult)) { - \RainLoop\Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY); } return $sResult; @@ -686,10 +686,10 @@ class Actions */ public function GetSpecLogoutCustomMgsWithDeletion() { - $sResult = \RainLoop\Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, ''); + $sResult =\RainLoopOld\Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, ''); if (0 < strlen($sResult)) { - \RainLoop\Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY); + \RainLoopOld\Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY); } return $sResult; @@ -700,7 +700,7 @@ class Actions */ public function SetSpecLogoutCustomMgsWithDeletion($sMessage) { - \RainLoop\Utils::SetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, $sMessage, 0); + \RainLoopOld\Utils::SetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, $sMessage, 0); } /** @@ -708,7 +708,7 @@ class Actions */ private function setAdminAuthToken($sToken) { - \RainLoop\Utils::SetCookie(self::AUTH_ADMIN_TOKEN_KEY, $sToken, 0); + \RainLoopOld\Utils::SetCookie(self::AUTH_ADMIN_TOKEN_KEY, $sToken, 0); } /** @@ -725,7 +725,7 @@ class Actions */ private function getAdminAuthToken() { - return \RainLoop\Utils::GetCookie(self::AUTH_ADMIN_TOKEN_KEY, ''); + return\RainLoopOld\Utils::GetCookie(self::AUTH_ADMIN_TOKEN_KEY, ''); } /** @@ -733,7 +733,7 @@ class Actions */ public function ClearAdminAuthToken() { - $aAdminHash = \RainLoop\Utils::DecodeKeyValuesQ($this->getAdminAuthToken()); + $aAdminHash =\RainLoopOld\Utils::DecodeKeyValuesQ($this->getAdminAuthToken()); if ( !empty($aAdminHash[0]) && !empty($aAdminHash[1]) && !empty($aAdminHash[2]) && 'token' === $aAdminHash[0] && \md5(R_APP_SALT) === $aAdminHash[1] @@ -742,14 +742,14 @@ class Actions $this->Cacher(null, true)->Delete(\RainLoop\KeyPathHelper::SessionAdminKey($aAdminHash[2])); } - \RainLoop\Utils::ClearCookie(self::AUTH_ADMIN_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(self::AUTH_ADMIN_TOKEN_KEY); } /** * @param bool $bThrowExceptionOnFalse = false * - * @return \RainLoop\Model\Account|bool - * @throws \RainLoop\Exceptions\ClientException + * @return\RainLoopOld\Model\Account|bool + * @throws\RainLoopOld\Exceptions\ClientException */ public function GetAccount($bThrowExceptionOnFalse = false) { @@ -770,13 +770,13 @@ class Actions } /** - * @return \RainLoop\Social + * @return\RainLoopOld\Social */ public function Social() { if (null === $this->oSocial) { - $this->oSocial = new \RainLoop\Social($this->Http(), $this); + $this->oSocial = new\RainLoopOld\Social($this->Http(), $this); } return $this->oSocial; @@ -797,13 +797,13 @@ class Actions } /** - * @return \RainLoop\Providers\Filters + * @return\RainLoopOld\Providers\Filters */ public function FiltersProvider() { if (null === $this->oFiltersProvider) { - $this->oFiltersProvider = new \RainLoop\Providers\Filters( + $this->oFiltersProvider = new\RainLoopOld\Providers\Filters( $this->fabrica('filters')); } @@ -811,13 +811,13 @@ class Actions } /** - * @return \RainLoop\Providers\ChangePassword + * @return\RainLoopOld\Providers\ChangePassword */ public function ChangePasswordProvider() { if (null === $this->oChangePasswordProvider) { - $this->oChangePasswordProvider = new \RainLoop\Providers\ChangePassword( + $this->oChangePasswordProvider = new\RainLoopOld\Providers\ChangePassword( $this, $this->fabrica('change-password'), !!$this->Config()->Get('labs', 'check_new_password_strength', true) ); } @@ -826,13 +826,13 @@ class Actions } /** - * @return \RainLoop\Providers\TwoFactorAuth + * @return\RainLoopOld\Providers\TwoFactorAuth */ public function TwoFactorAuthProvider() { if (null === $this->oTwoFactorAuthProvider) { - $this->oTwoFactorAuthProvider = new \RainLoop\Providers\TwoFactorAuth( + $this->oTwoFactorAuthProvider = new\RainLoopOld\Providers\TwoFactorAuth( $this->Config()->Get('security', 'allow_two_factor_auth', false) ? $this->fabrica('two-factor-auth') : null ); } @@ -841,7 +841,7 @@ class Actions } /** - * @return \RainLoop\Providers\Prem + * @return\RainLoopOld\Providers\Prem */ public function PremProvider() { @@ -849,7 +849,7 @@ class Actions { if (\file_exists(R_APP_VERSION_ROOT_PATH.'app/libraries/RainLoop/Providers/Prem.php')) { - $this->oPremProvider = new \RainLoop\Providers\Prem( + $this->oPremProvider = new\RainLoopOld\Providers\Prem( $this->Config(), $this->Logger(), $this->Cacher(null, true) ); } @@ -865,7 +865,7 @@ class Actions /** * @param bool $bLocal = false * - * @return \RainLoop\Providers\Storage + * @return\RainLoopOld\Providers\Storage */ public function StorageProvider($bLocal = false) { @@ -873,7 +873,7 @@ class Actions { if (null === $this->oLocalStorageProvider) { - $this->oLocalStorageProvider = new \RainLoop\Providers\Storage( + $this->oLocalStorageProvider = new\RainLoopOld\Providers\Storage( $this->fabrica('storage-local')); } @@ -883,7 +883,7 @@ class Actions { if (null === $this->oStorageProvider) { - $this->oStorageProvider = new \RainLoop\Providers\Storage( + $this->oStorageProvider = new\RainLoopOld\Providers\Storage( $this->fabrica('storage')); } @@ -894,7 +894,7 @@ class Actions } /** - * @return \RainLoop\Providers\Settings + * @return\RainLoopOld\Providers\Settings */ public function SettingsProvider($bLocal = false) { @@ -902,7 +902,7 @@ class Actions { if (null === $this->oLocalSettingsProvider) { - $this->oLocalSettingsProvider = new \RainLoop\Providers\Settings( + $this->oLocalSettingsProvider = new\RainLoopOld\Providers\Settings( $this->fabrica('settings-local')); } @@ -912,7 +912,7 @@ class Actions { if (null === $this->oSettingsProvider) { - $this->oSettingsProvider = new \RainLoop\Providers\Settings( + $this->oSettingsProvider = new\RainLoopOld\Providers\Settings( $this->fabrica('settings')); } @@ -923,13 +923,13 @@ class Actions } /** - * @return \RainLoop\Providers\Files + * @return\RainLoopOld\Providers\Files */ public function FilesProvider() { if (null === $this->oFilesProvider) { - $this->oFilesProvider = new \RainLoop\Providers\Files( + $this->oFilesProvider = new\RainLoopOld\Providers\Files( $this->fabrica('files')); } @@ -937,13 +937,13 @@ class Actions } /** - * @return \RainLoop\Providers\Domain + * @return\RainLoopOld\Providers\Domain */ public function DomainProvider() { if (null === $this->oDomainProvider) { - $this->oDomainProvider = new \RainLoop\Providers\Domain( + $this->oDomainProvider = new\RainLoopOld\Providers\Domain( $this->fabrica('domain'), $this->Plugins()); } @@ -951,13 +951,13 @@ class Actions } /** - * @return \RainLoop\Providers\Suggestions + * @return\RainLoopOld\Providers\Suggestions */ public function SuggestionsProvider() { if (null === $this->oSuggestionsProvider) { - $this->oSuggestionsProvider = new \RainLoop\Providers\Suggestions( + $this->oSuggestionsProvider = new\RainLoopOld\Providers\Suggestions( $this->fabrica('suggestions')); } @@ -965,17 +965,17 @@ class Actions } /** - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * @param bool $bForceEnable = false * - * @return \RainLoop\Providers\AddressBook + * @return\RainLoopOld\Providers\AddressBook */ public function AddressBookProvider($oAccount = null, $bForceEnable = false) { if (null === $this->oAddressBookProvider) { $oDriver = null; - if ($this->GetCapa(false, false, \RainLoop\Enumerations\Capa::CONTACTS, $oAccount)) + if ($this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::CONTACTS, $oAccount)) { if ($this->Config()->Get('contacts', 'enable', false) || $bForceEnable) { @@ -983,7 +983,7 @@ class Actions } } - $this->oAddressBookProvider = new \RainLoop\Providers\AddressBook($oDriver); + $this->oAddressBookProvider = new\RainLoopOld\Providers\AddressBook($oDriver); $this->oAddressBookProvider->SetLogger($this->Logger()); } @@ -991,7 +991,7 @@ class Actions } /** - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * @param bool $bForceFile = false * * @return \MailSo\Cache\CacheClient @@ -1064,13 +1064,13 @@ class Actions } /** - * @return \RainLoop\Plugins\Manager + * @return\RainLoopOld\Plugins\Manager */ public function Plugins() { if (null === $this->oPlugins) { - $this->oPlugins = new \RainLoop\Plugins\Manager($this); + $this->oPlugins = new\RainLoopOld\Plugins\Manager($this); $this->oPlugins->SetLogger($this->Logger()); } @@ -1094,7 +1094,7 @@ class Actions $aSessionParts = \explode(':', $sSessionFilter, 2); if (empty($aSessionParts[0]) || empty($aSessionParts[1]) || - (string) $aSessionParts[1] !== (string) \RainLoop\Utils::GetCookie($aSessionParts[0], '')) + (string) $aSessionParts[1] !== (string)\RainLoopOld\Utils::GetCookie($aSessionParts[0], '')) { return $this->oLogger; } @@ -1209,7 +1209,7 @@ class Actions } /** - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * @param array $aAdditionalParams = array() */ public function LoggerAuthHelper($oAccount = null, $aAdditionalParams = array()) @@ -1235,7 +1235,7 @@ class Actions $sRand = ''; } - return '' === $sRand ? '' : \RainLoop\Utils::EncodeKeyValuesQ(array('token', \md5(R_APP_SALT), $sRand)); + return '' === $sRand ? '' :\RainLoopOld\Utils::EncodeKeyValuesQ(array('token', \md5(R_APP_SALT), $sRand)); } /** @@ -1248,7 +1248,7 @@ class Actions $bResult = false; if ($this->Config()->Get('security', 'allow_admin_panel', true)) { - $aAdminHash = \RainLoop\Utils::DecodeKeyValuesQ($this->getAdminAuthToken()); + $aAdminHash =\RainLoopOld\Utils::DecodeKeyValuesQ($this->getAdminAuthToken()); if (!empty($aAdminHash[0]) && !empty($aAdminHash[1]) && !empty($aAdminHash[2]) && 'token' === $aAdminHash[0] && \md5(R_APP_SALT) === $aAdminHash[1] && '' !== $this->Cacher(null, true)->Get(\RainLoop\KeyPathHelper::SessionAdminKey($aAdminHash[2]), '') @@ -1260,7 +1260,7 @@ class Actions if (!$bResult && $bThrowExceptionOnFalse) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } return $bResult; @@ -1273,8 +1273,8 @@ class Actions { if (!empty($sTo)) { - \RainLoop\Utils::SetCookie(self::AUTH_MAILTO_TOKEN_KEY, - \RainLoop\Utils::EncodeKeyValuesQ(array( + \RainLoopOld\Utils::SetCookie(self::AUTH_MAILTO_TOKEN_KEY, + \RainLoopOld\Utils::EncodeKeyValuesQ(array( 'Time' => \microtime(true), 'MailTo' => 'MailTo', 'To' => $sTo @@ -1290,7 +1290,7 @@ class Actions * @param string $sClientCert = '' * @param bool $bThrowProvideException = false * - * @return \RainLoop\Model\Account|null + * @return\RainLoopOld\Model\Account|null */ public function LoginProvide($sEmail, $sLogin, $sPassword, $sSignMeToken = '', $sClientCert = '', $bThrowProvideException = false) { @@ -1298,26 +1298,26 @@ class Actions if (0 < \strlen($sEmail) && 0 < \strlen($sLogin) && 0 < \strlen($sPassword)) { $oDomain = $this->DomainProvider()->Load(\MailSo\Base\Utils::GetDomainFromEmail($sEmail), true); - if ($oDomain instanceof \RainLoop\Model\Domain) + if ($oDomain instanceof\RainLoopOld\Model\Domain) { if ($oDomain->ValidateWhiteList($sEmail, $sLogin)) { - $oAccount = \RainLoop\Model\Account::NewInstance($sEmail, $sLogin, $sPassword, $oDomain, $sSignMeToken, '', '', $sClientCert); + $oAccount =\RainLoopOld\Model\Account::NewInstance($sEmail, $sLogin, $sPassword, $oDomain, $sSignMeToken, '', '', $sClientCert); $this->Plugins()->RunHook('filter.acount', array(&$oAccount)); - if ($bThrowProvideException && !($oAccount instanceof \RainLoop\Model\Account)) + if ($bThrowProvideException && !($oAccount instanceof\RainLoopOld\Model\Account)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } } else if ($bThrowProvideException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountNotAllowed); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AccountNotAllowed); } } else if ($bThrowProvideException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainNotAllowed); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::DomainNotAllowed); } } @@ -1330,26 +1330,26 @@ class Actions * @param bool $bValidateShortToken = true * @param bool $bQ = false * - * @return \RainLoop\Model\Account|bool - * @throws \RainLoop\Exceptions\ClientException + * @return\RainLoopOld\Model\Account|bool + * @throws\RainLoopOld\Exceptions\ClientException */ public function GetAccountFromCustomToken($sToken, $bThrowExceptionOnFalse = true, $bValidateShortToken = true, $bQ = false) { $oResult = false; if (!empty($sToken)) { - $aAccountHash = $bQ ? \RainLoop\Utils::DecodeKeyValuesQ($sToken) : \RainLoop\Utils::DecodeKeyValues($sToken); + $aAccountHash = $bQ ?\RainLoopOld\Utils::DecodeKeyValuesQ($sToken) :\RainLoopOld\Utils::DecodeKeyValues($sToken); if (!empty($aAccountHash[0]) && 'token' === $aAccountHash[0] && // simple token validation 8 <= \count($aAccountHash) && // length checking !empty($aAccountHash[7]) && // does short token exist - (!$bValidateShortToken || \RainLoop\Utils::GetShortToken() === $aAccountHash[7] || // check short token if needed + (!$bValidateShortToken ||\RainLoopOld\Utils::GetShortToken() === $aAccountHash[7] || // check short token if needed (isset($aAccountHash[10]) && 0 < $aAccountHash[10] && \time() < $aAccountHash[10])) ) { $oAccount = $this->LoginProvide($aAccountHash[1], $aAccountHash[2], $aAccountHash[3], empty($aAccountHash[5]) ? '' : $aAccountHash[5], empty($aAccountHash[11]) ? '' : $aAccountHash[11], $bThrowExceptionOnFalse); - if ($oAccount instanceof \RainLoop\Model\Account) + if ($oAccount instanceof\RainLoopOld\Model\Account) { if (!empty($aAccountHash[8]) && !empty($aAccountHash[9])) // init proxy user/password { @@ -1366,39 +1366,39 @@ class Actions } else if ($bThrowExceptionOnFalse) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } } - if ($bThrowExceptionOnFalse && !($oResult instanceof \RainLoop\Model\Account)) + if ($bThrowExceptionOnFalse && !($oResult instanceof\RainLoopOld\Model\Account)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } return $oResult; } /** - * @return \RainLoop\Model\Account|bool + * @return\RainLoopOld\Model\Account|bool */ public function GetAccountFromSignMeToken() { $oAccount = false; - $sSignMeToken = \RainLoop\Utils::GetCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY, ''); + $sSignMeToken =\RainLoopOld\Utils::GetCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY, ''); if (!empty($sSignMeToken)) { - $aTokenData = \RainLoop\Utils::DecodeKeyValuesQ($sSignMeToken); + $aTokenData =\RainLoopOld\Utils::DecodeKeyValuesQ($sSignMeToken); if (\is_array($aTokenData) && !empty($aTokenData['e']) && !empty($aTokenData['t'])) { $sTokenSettings = $this->StorageProvider()->Get($aTokenData['e'], - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'sign_me' ); if (!empty($sTokenSettings)) { - $aSignMeData = \RainLoop\Utils::DecodeKeyValuesQ($sTokenSettings); + $aSignMeData =\RainLoopOld\Utils::DecodeKeyValuesQ($sTokenSettings); if (\is_array($aSignMeData) && !empty($aSignMeData['AuthToken']) && !empty($aSignMeData['SignMetToken']) && @@ -1411,7 +1411,7 @@ class Actions } else { - \RainLoop\Utils::ClearCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY); } return $oAccount; @@ -1420,8 +1420,8 @@ class Actions /** * @param bool $bThrowExceptionOnFalse = true * - * @return \RainLoop\Model\Account|bool - * @throws \RainLoop\Exceptions\ClientException + * @return\RainLoopOld\Model\Account|bool + * @throws\RainLoopOld\Exceptions\ClientException */ public function getAccountFromToken($bThrowExceptionOnFalse = true) { @@ -1448,7 +1448,7 @@ class Actions $oConfig = $this->Config(); $aAttachmentsActions = array(); - if ($this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::ATTACHMENTS_ACTIONS)) + if ($this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::ATTACHMENTS_ACTIONS)) { if (!!\class_exists('ZipArchive')) { @@ -1471,9 +1471,9 @@ class Actions 'admin' => $bAdmin, 'mobile' => $bMobile, 'mobileDevice' => $bMobileDevice, - 'webPath' => \RainLoop\Utils::WebPath(), - 'webVersionPath' => \RainLoop\Utils::WebVersionPath(), - 'token' => $oConfig->Get('security', 'csrf_protection', false) ? \RainLoop\Utils::GetCsrfToken() : '', + 'webPath' =>\RainLoopOld\Utils::WebPath(), + 'webVersionPath' =>\RainLoopOld\Utils::WebVersionPath(), + 'token' => $oConfig->Get('security', 'csrf_protection', false) ?\RainLoopOld\Utils::GetCsrfToken() : '', 'inIframe' => (bool) $oConfig->Get('labs', 'in_iframe', false), 'allowHtmlEditorSourceButton' => (bool) $oConfig->Get('labs', 'allow_html_editor_source_button', false), 'allowHtmlEditorBitiButtons' => (bool) $oConfig->Get('labs', 'allow_html_editor_biti_buttons', false), @@ -1590,7 +1590,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$bAdmin) { $oAccount = $this->getAccountFromToken(false); - if ($oAccount instanceof \RainLoop\Model\Account) + if ($oAccount instanceof\RainLoopOld\Model\Account) { $aResult['IncludeCss'] = $aResult['UserCss']; @@ -1626,12 +1626,12 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($aResult['AccountSignMe']) { - $sToken = \RainLoop\Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null); + $sToken =\RainLoopOld\Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null); if (null !== $sToken) { - \RainLoop\Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY); - $mMailToData = \RainLoop\Utils::DecodeKeyValuesQ($sToken); + $mMailToData =\RainLoopOld\Utils::DecodeKeyValuesQ($sToken); if (\is_array($mMailToData) && !empty($mMailToData['MailTo']) && 'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To'])) { @@ -1752,8 +1752,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($aResult['Auth'] && !$aResult['RequireTwoFactor']) { - if ($this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount) && - $this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::TWO_FACTOR_FORCE, $oAccount) && + if ($this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount) && + $this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::TWO_FACTOR_FORCE, $oAccount) && $this->TwoFactorAuthProvider()->IsActive()) { $aData = $this->getTwoFactorInfo($oAccount, true); @@ -1844,7 +1844,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['AllowLanguagesOnSettings'] = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true); $aResult['AllowLanguagesOnLogin'] = (bool) $oConfig->Get('login', 'allow_languages_on_login', true); $aResult['AttachmentLimit'] = ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024; - $aResult['SignMe'] = (string) $oConfig->Get('login', 'sign_me_auto', \RainLoop\Enumerations\SignMeType::DEFAULT_OFF); + $aResult['SignMe'] = (string) $oConfig->Get('login', 'sign_me_auto',\RainLoopOld\Enumerations\SignMeType::DEFAULT_OFF); $aResult['UseLocalProxyForExternalImages'] = (bool) $oConfig->Get('labs', 'use_local_proxy_for_external_images', false); // user @@ -1852,7 +1852,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['MPP'] = (int) $oConfig->Get('webmail', 'messages_per_page', 25); $aResult['SoundNotification'] = false; $aResult['DesktopNotifications'] = false; - $aResult['Layout'] = (int) $oConfig->Get('defaults', 'view_layout', \RainLoop\Enumerations\Layout::SIDE_PREVIEW); + $aResult['Layout'] = (int) $oConfig->Get('defaults', 'view_layout',\RainLoopOld\Enumerations\Layout::SIDE_PREVIEW); $aResult['EditorDefaultType'] = (string) $oConfig->Get('defaults', 'view_editor_type', ''); $aResult['UseCheckboxesInList'] = (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true); $aResult['AutoLogout'] = (int) $oConfig->Get('defaults', 'autologout', 30); @@ -1866,15 +1866,15 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['UserBackgroundName'] = ''; $aResult['UserBackgroundHash'] = ''; - if (!$bAdmin && $oAccount instanceof \RainLoop\Model\Account) + if (!$bAdmin && $oAccount instanceof\RainLoopOld\Model\Account) { $aResult['ParentEmail'] = $oAccount->ParentEmail(); $oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount); - if ($oSettingsLocal instanceof \RainLoop\Settings) + if ($oSettingsLocal instanceof\RainLoopOld\Settings) { -// if ($this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount)) +// if ($this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount)) $aResult['SentFolder'] = (string) $oSettingsLocal->GetConf('SentFolder', ''); $aResult['DraftFolder'] = (string) $oSettingsLocal->GetConf('DraftFolder', ''); @@ -1884,9 +1884,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['NullFolder'] = (string) $oSettingsLocal->GetConf('NullFolder', ''); } - if ($this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::SETTINGS, $oAccount)) + if ($this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::SETTINGS, $oAccount)) { - if ($oSettings instanceof \RainLoop\Settings) + if ($oSettings instanceof\RainLoopOld\Settings) { if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) { @@ -1904,12 +1904,12 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['AutoLogout'] = (int) $oSettings->GetConf('AutoLogout', $aResult['AutoLogout']); $aResult['Layout'] = (int) $oSettings->GetConf('Layout', $aResult['Layout']); - if (!$this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::AUTOLOGOUT, $oAccount)) + if (!$this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::AUTOLOGOUT, $oAccount)) { $aResult['AutoLogout'] = 0; } - if ($this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::USER_BACKGROUND, $oAccount)) + if ($this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::USER_BACKGROUND, $oAccount)) { $aResult['UserBackgroundName'] = (string) $oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']); $aResult['UserBackgroundHash'] = (string) $oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']); @@ -1923,12 +1923,12 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['EnableTwoFactor'] = (bool) $oSettings->GetConf('EnableTwoFactor', $aResult['EnableTwoFactor']); } - if ($oSettingsLocal instanceof \RainLoop\Settings) + if ($oSettingsLocal instanceof\RainLoopOld\Settings) { $aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']); $aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']); - if ($this->GetCapa(false, $bMobile, \RainLoop\Enumerations\Capa::THEMES, $oAccount)) + if ($this->GetCapa(false, $bMobile,\RainLoopOld\Enumerations\Capa::THEMES, $oAccount)) { $sTheme = (string) $oSettingsLocal->GetConf('Theme', $sTheme); } @@ -1996,7 +1996,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins // Mobile override if ($bMobile) { - $aResult['Layout'] = \RainLoop\Enumerations\Layout::NO_PREVIEW; + $aResult['Layout'] =\RainLoopOld\Enumerations\Layout::NO_PREVIEW; $aResult['SoundNotification'] = false; $aResult['DesktopNotifications'] = false; @@ -2123,11 +2123,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount */ public function AuthToken($oAccount) { - if ($oAccount instanceof \RainLoop\Model\Account) + if ($oAccount instanceof\RainLoopOld\Model\Account) { $this->SetAuthToken($oAccount); @@ -2141,10 +2141,10 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param bool $bAuthLog = false * - * @throws \RainLoop\Exceptions\ClientException + * @throws\RainLoopOld\Exceptions\ClientException */ public function CheckMailConnection($oAccount, $bAuthLog = false) { @@ -2158,7 +2158,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\MailSo\Net\Exceptions\ConnectionException $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException); } catch (\MailSo\Imap\Exceptions\LoginBadCredentialsException $oException) { @@ -2169,17 +2169,17 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($this->Config()->Get('labs', 'imap_show_login_alert', true)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError, + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException, $oException->getAlertFromStatus()); } else { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); } } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); } } @@ -2210,8 +2210,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins * @param string $bAdditionalCodeSignMe = false * @param string $bSkipTwoFactorAuth = false * - * @return \RainLoop\Model\Account - * @throws \RainLoop\Exceptions\ClientException + * @return\RainLoopOld\Model\Account + * @throws\RainLoopOld\Exceptions\ClientException */ public function LoginProcess(&$sEmail, &$sPassword, $sSignMeToken = '', $sAdditionalCode = '', $bAdditionalCodeSignMe = false, $bSkipTwoFactorAuth = false) @@ -2246,7 +2246,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sLine = \trim(\implode('.', $aDomainParts), '. '); $oDomain = $oDomainProvider->Load($sLine, false); - if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain) + if ($oDomain && $oDomain instanceof\RainLoopOld\Model\Domain) { $bAdded = true; $this->Logger()->Write('Check "'.$sLine.'": OK ('.$sEmail.' > '.$sEmail.'@'.$sLine.')', @@ -2268,7 +2268,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $sLine = $sUserHost; $oDomain = $oDomainProvider->Load($sLine, true); - if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain) + if ($oDomain && $oDomain instanceof\RainLoopOld\Model\Domain) { $bAdded = true; $this->Logger()->Write('Check "'.$sLine.'" with wildcard: OK ('.$sEmail.' > '.$sEmail.'@'.$sLine.')', @@ -2304,7 +2304,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $this->loginErrorDelay(); - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); } $this->Logger()->AddSecret($sPassword); @@ -2327,16 +2327,16 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->LoginProvide($sEmail, $sLogin, $sPassword, $sSignMeToken, $sClientCert, true); - if (!($oAccount instanceof \RainLoop\Model\Account)) + if (!($oAccount instanceof\RainLoopOld\Model\Account)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } $this->Plugins()->RunHook('event.login-post-login-provide', array(&$oAccount)); - if (!($oAccount instanceof \RainLoop\Model\Account)) + if (!($oAccount instanceof\RainLoopOld\Model\Account)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } } catch (\Exception $oException) @@ -2353,7 +2353,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($aData && isset($aData['IsSet'], $aData['Enable']) && !empty($aData['Secret']) && $aData['IsSet'] && $aData['Enable']) { $sSecretHash = \md5(R_APP_SALT.$aData['Secret'].\RainLoop\Utils::Fingerprint()); - $sSecretCookieHash = \RainLoop\Utils::GetCookie(self::AUTH_TFA_SIGN_ME_TOKEN_KEY, ''); + $sSecretCookieHash =\RainLoopOld\Utils::GetCookie(self::AUTH_TFA_SIGN_ME_TOKEN_KEY, ''); if (empty($sSecretCookieHash) || $sSecretHash !== $sSecretCookieHash) { @@ -2362,7 +2362,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $this->Logger()->Write('TFA: Required Code for '.$oAccount->ParentEmailHelper().' account.'); - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountTwoFactorAuthRequired); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AccountTwoFactorAuthRequired); } else { @@ -2386,12 +2386,12 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $this->LoggerAuthHelper($oAccount); - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountTwoFactorAuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AccountTwoFactorAuthError); } if ($bAdditionalCodeSignMe) { - \RainLoop\Utils::SetCookie(self::AUTH_TFA_SIGN_ME_TOKEN_KEY, $sSecretHash, + \RainLoopOld\Utils::SetCookie(self::AUTH_TFA_SIGN_ME_TOKEN_KEY, $sSecretHash, \time() + 60 * 60 * 24 * 14); } } @@ -2448,7 +2448,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins ) { \sleep((int) $sPassword); - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } try @@ -2460,7 +2460,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins catch (\RainLoop\Exceptions\ClientException $oException) { if ($oException && - \RainLoop\Notifications::AccountTwoFactorAuthRequired === $oException->getCode()) + \RainLoopOld\Notifications::AccountTwoFactorAuthRequired === $oException->getCode()) { return $this->DefaultResponse(__FUNCTION__, true, array( 'TwoFactorAuth' => true @@ -2494,16 +2494,16 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return array */ public function GetAccounts($oAccount) { - if ($this->GetCapa(false, false, \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) + if ($this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) { $sAccounts = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts' ); @@ -2523,7 +2523,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins else if (1 < \count($aAccounts)) { $sOrder = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts_identities_order' ); @@ -2553,7 +2553,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return array */ @@ -2565,7 +2565,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aData = array(); $sData = $this->StorageProvider(true)->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'templates' ); @@ -2578,7 +2578,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { foreach ($aData as $aItem) { - $oItem = \RainLoop\Model\Template::NewInstance(); + $oItem =\RainLoopOld\Model\Template::NewInstance(); $oItem->FromJSON($aItem); if ($oItem && $oItem->Validate()) @@ -2591,7 +2591,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (1 < \count($aTemplates)) { $sOrder = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'templates_order' ); @@ -2609,10 +2609,10 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param string $sID * - * @return \RainLoop\Model\Identity + * @return\RainLoopOld\Model\Identity */ public function GetTemplateByID($oAccount, $sID) { @@ -2632,14 +2632,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return array */ public function GetIdentities($oAccount) { $bAllowIdentities = $this->GetCapa(false, false, - \RainLoop\Enumerations\Capa::IDENTITIES, $oAccount); + \RainLoopOld\Enumerations\Capa::IDENTITIES, $oAccount); $aIdentities = array(); if ($oAccount) @@ -2647,7 +2647,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aSubIdentities = array(); $sData = $this->StorageProvider(true)->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'identities' ); @@ -2662,7 +2662,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { foreach ($aSubIdentities as $aItem) { - $oItem = \RainLoop\Model\Identity::NewInstance(); + $oItem =\RainLoopOld\Model\Identity::NewInstance(); $oItem->FromJSON($aItem); if ($oItem && $oItem->Validate()) @@ -2685,13 +2685,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$bHasAccountIdentity) { \array_unshift($aIdentities, - \RainLoop\Model\Identity::NewInstanceFromAccount($oAccount)); + \RainLoopOld\Model\Identity::NewInstanceFromAccount($oAccount)); } if (1 < \count($aIdentities) && $bAllowIdentities) { $sOrder = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts_identities_order' ); @@ -2719,11 +2719,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param string $sID * @param bool $bFirstOnEmpty = false * - * @return \RainLoop\Model\Identity + * @return\RainLoopOld\Model\Identity */ public function GetIdentityByID($oAccount, $sID, $bFirstOnEmpty = false) { @@ -2743,9 +2743,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins return $bFirstOnEmpty && \is_array($aIdentities) && isset($aIdentities[0]) ? $aIdentities[0] : null; } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * - * @return \RainLoop\Model\Identity + * @return\RainLoopOld\Model\Identity */ public function GetAccountIdentity($oAccount) { @@ -2753,7 +2753,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param array $aAccounts = array() * * @return array @@ -2765,14 +2765,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins (1 === \count($aAccounts) && !empty($aAccounts[$sParentEmail]))) { $this->StorageProvider()->Clear($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts' ); } else { $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts', @\json_encode($aAccounts) ); @@ -2780,14 +2780,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param array $aIdentities = array() * * @return array */ public function SetIdentities($oAccount, $aIdentities = array()) { - $bAllowIdentities = $this->GetCapa(false, false, \RainLoop\Enumerations\Capa::IDENTITIES, $oAccount); + $bAllowIdentities = $this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::IDENTITIES, $oAccount); $aResult = array(); foreach ($aIdentities as $oItem) @@ -2801,14 +2801,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } return $this->StorageProvider(true)->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'identities', @\json_encode($aResult) ); } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param array $aTemplates = array() * * @return array @@ -2822,7 +2822,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } return $this->StorageProvider(true)->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'templates', @\json_encode($aResult) ); @@ -2837,7 +2837,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FILTERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FILTERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -2866,7 +2866,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FILTERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FILTERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -2881,7 +2881,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { if ($aFilter) { - $oFilter = new \RainLoop\Providers\Filters\Classes\Filter(); + $oFilter = new\RainLoopOld\Providers\Filters\Classes\Filter(); if ($oFilter->FromJSON($aFilter)) { $aFilters[] = $oFilter; @@ -2906,7 +2906,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -2926,11 +2926,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true); if ($bNew && ($oAccount->Email() === $sEmail || $sParentEmail === $sEmail || isset($aAccounts[$sEmail]))) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountAlreadyExists); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AccountAlreadyExists); } else if (!$bNew && !isset($aAccounts[$sEmail])) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountDoesNotExist); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AccountDoesNotExist); } $oNewAccount = $this->LoginProcess($sEmail, $sPassword, '', '', false, true); @@ -2955,7 +2955,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -2994,7 +2994,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins */ public function DoAttachmentsActions() { - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::ATTACHMENTS_ACTIONS)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::ATTACHMENTS_ACTIONS)) { return $this->FalseResponse(__FUNCTION__); } @@ -3085,7 +3085,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mResult = array( 'Files' => array(array( 'FileName' => 'attachments.zip', - 'Hash' => \RainLoop\Utils::EncodeKeyValuesQ(array( + 'Hash' =>\RainLoopOld\Utils::EncodeKeyValuesQ(array( 'V' => R_APP_VERSION, 'Account' => $oAccount ? \md5($oAccount->Hash()) : '', 'FileName' => 'attachments.zip', @@ -3173,7 +3173,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $mResult['Files'][] = array( 'FileName' => isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat', - 'Hash' => \RainLoop\Utils::EncodeKeyValuesQ($aItem) + 'Hash' =>\RainLoopOld\Utils::EncodeKeyValuesQ($aItem) ); } @@ -3198,10 +3198,10 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - $oIdentity = \RainLoop\Model\Identity::NewInstance(); + $oIdentity =\RainLoopOld\Model\Identity::NewInstance(); if (!$oIdentity->FromJSON($this->GetActionParams(), true)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); } $aIdentities = $this->GetIdentities($oAccount); @@ -3241,7 +3241,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::IDENTITIES, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::IDENTITIES, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -3249,7 +3249,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sId = \trim($this->GetActionParam('IdToDelete', '')); if (empty($sId)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); } $aNew = array(); @@ -3275,15 +3275,15 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TEMPLATES, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TEMPLATES, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } - $oTemplate = \RainLoop\Model\Template::NewInstance(); + $oTemplate =\RainLoopOld\Model\Template::NewInstance(); if (!$oTemplate->FromJSON($this->GetActionParams(), true)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); } if ('' === $oTemplate->Id()) @@ -3317,7 +3317,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TEMPLATES, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TEMPLATES, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -3325,7 +3325,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sId = \trim($this->GetActionParam('IdToDelete', '')); if (empty($sId)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); } $aNew = array(); @@ -3350,7 +3350,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TEMPLATES, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TEMPLATES, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -3358,7 +3358,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sId = \trim($this->GetActionParam('ID', '')); if (empty($sId)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); } $oTemplate = false; @@ -3395,7 +3395,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } return $this->DefaultResponse(__FUNCTION__, $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts_identities_order', + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts_identities_order', \json_encode(array( 'Accounts' => \is_array($aAccounts) ? $aAccounts : array(), 'Identities' => \is_array($aIdentities) ? $aIdentities : array() @@ -3414,7 +3414,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mAccounts = false; - if ($this->GetCapa(false, false, \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) + if ($this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) { $mAccounts = $this->GetAccounts($oAccount); $mAccounts = \array_keys($mAccounts); @@ -3440,7 +3440,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TEMPLATES, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TEMPLATES, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -3496,7 +3496,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $bComplete = true; $aCounts = array(); - if ($this->GetCapa(false, false, \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) + if ($this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount)) { $iLimit = 7; $mAccounts = $this->GetAccounts($oAccount); @@ -3533,16 +3533,16 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount */ public function ClearSignMeData($oAccount) { if ($oAccount) { - \RainLoop\Utils::ClearCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY); $this->StorageProvider()->Clear($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'sign_me' ); } @@ -3563,7 +3563,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$oAccount->IsAdditionalAccount()) { - \RainLoop\Utils::ClearCookie(\RainLoop\Actions::AUTH_SPEC_TOKEN_KEY); + \RainLoopOld\Utils::ClearCookie(\RainLoop\Actions::AUTH_SPEC_TOKEN_KEY); } } @@ -3577,7 +3577,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $this->Plugins()->RunHook('service.app-delay-start-begin'); - \RainLoop\Utils::UpdateConnectionToken(); + \RainLoopOld\Utils::UpdateConnectionToken(); $bMainCache = false; $bFilesCache = false; @@ -3588,7 +3588,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $iOneDay3 = 60 * 60 * 30; $sTimers = $this->StorageProvider()->Get(null, - \RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY, 'Cache/Timers', ''); + \RainLoopOld\Providers\Storage\Enumerations\StorageType::NOBODY, 'Cache/Timers', ''); $aTimers = \explode(',', $sTimers); @@ -3617,7 +3617,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($bMainCache || $bFilesCache || $bVersionsCache) { if (!$this->StorageProvider()->Put(null, - \RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY, 'Cache/Timers', + \RainLoopOld\Providers\Storage\Enumerations\StorageType::NOBODY, 'Cache/Timers', \implode(',', array($iMainCacheTime, $iFilesCacheTime, $iVersionsCacheTime)))) { $bMainCache = $bFilesCache = $bVersionsCache = false; @@ -3671,7 +3671,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Config\Application $oConfig + * @param\RainLoopOld\Config\Application $oConfig * @param string $sParamName * @param string $sConfigSector * @param string $sConfigName @@ -3717,7 +3717,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Config\Application $oConfig + * @param\RainLoopOld\Config\Application $oConfig * @param string $sParamName * @param string $sCapa */ @@ -3725,41 +3725,41 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { switch ($sCapa) { - case \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS: + case\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS: $this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_additional_accounts', 'bool'); break; - case \RainLoop\Enumerations\Capa::IDENTITIES: + case\RainLoopOld\Enumerations\Capa::IDENTITIES: $this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_additional_identities', 'bool'); break; - case \RainLoop\Enumerations\Capa::TEMPLATES: + case\RainLoopOld\Enumerations\Capa::TEMPLATES: $this->setConfigFromParams($oConfig, $sParamName, 'capa', 'x-templates', 'bool'); break; - case \RainLoop\Enumerations\Capa::TWO_FACTOR: + case\RainLoopOld\Enumerations\Capa::TWO_FACTOR: $this->setConfigFromParams($oConfig, $sParamName, 'security', 'allow_two_factor_auth', 'bool'); break; - case \RainLoop\Enumerations\Capa::TWO_FACTOR_FORCE: + case\RainLoopOld\Enumerations\Capa::TWO_FACTOR_FORCE: $this->setConfigFromParams($oConfig, $sParamName, 'security', 'force_two_factor_auth', 'bool'); break; - case \RainLoop\Enumerations\Capa::GRAVATAR: + case\RainLoopOld\Enumerations\Capa::GRAVATAR: $this->setConfigFromParams($oConfig, $sParamName, 'labs', 'allow_gravatar', 'bool'); break; - case \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS: + case\RainLoopOld\Enumerations\Capa::ATTACHMENT_THUMBNAILS: $this->setConfigFromParams($oConfig, $sParamName, 'interface', 'show_attachment_thumbnail', 'bool'); break; - case \RainLoop\Enumerations\Capa::THEMES: + case\RainLoopOld\Enumerations\Capa::THEMES: $this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_themes', 'bool'); break; - case \RainLoop\Enumerations\Capa::USER_BACKGROUND: + case\RainLoopOld\Enumerations\Capa::USER_BACKGROUND: $this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_user_background', 'bool'); break; - case \RainLoop\Enumerations\Capa::OPEN_PGP: + case\RainLoopOld\Enumerations\Capa::OPEN_PGP: $this->setConfigFromParams($oConfig, $sParamName, 'security', 'openpgp', 'bool'); break; } } /** - * @param \RainLoop\Settings $oSettings + * @param\RainLoopOld\Settings $oSettings * @param string $sConfigName * @param string $sType = 'string' * @param callable|null $mStringCallback = null @@ -3843,16 +3843,16 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins return $self->ValidateContactPdoType($sType); }); - $this->setCapaFromParams($oConfig, 'CapaAdditionalAccounts', \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS); - $this->setCapaFromParams($oConfig, 'CapaIdentities', \RainLoop\Enumerations\Capa::IDENTITIES); - $this->setCapaFromParams($oConfig, 'CapaTemplates', \RainLoop\Enumerations\Capa::TEMPLATES); - $this->setCapaFromParams($oConfig, 'CapaTwoFactorAuth', \RainLoop\Enumerations\Capa::TWO_FACTOR); - $this->setCapaFromParams($oConfig, 'CapaTwoFactorAuthForce', \RainLoop\Enumerations\Capa::TWO_FACTOR_FORCE); - $this->setCapaFromParams($oConfig, 'CapaOpenPGP', \RainLoop\Enumerations\Capa::OPEN_PGP); - $this->setCapaFromParams($oConfig, 'CapaGravatar', \RainLoop\Enumerations\Capa::GRAVATAR); - $this->setCapaFromParams($oConfig, 'CapaThemes', \RainLoop\Enumerations\Capa::THEMES); - $this->setCapaFromParams($oConfig, 'CapaUserBackground', \RainLoop\Enumerations\Capa::USER_BACKGROUND); - $this->setCapaFromParams($oConfig, 'CapaAttachmentThumbnails', \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS); + $this->setCapaFromParams($oConfig, 'CapaAdditionalAccounts',\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS); + $this->setCapaFromParams($oConfig, 'CapaIdentities',\RainLoopOld\Enumerations\Capa::IDENTITIES); + $this->setCapaFromParams($oConfig, 'CapaTemplates',\RainLoopOld\Enumerations\Capa::TEMPLATES); + $this->setCapaFromParams($oConfig, 'CapaTwoFactorAuth',\RainLoopOld\Enumerations\Capa::TWO_FACTOR); + $this->setCapaFromParams($oConfig, 'CapaTwoFactorAuthForce',\RainLoopOld\Enumerations\Capa::TWO_FACTOR_FORCE); + $this->setCapaFromParams($oConfig, 'CapaOpenPGP',\RainLoopOld\Enumerations\Capa::OPEN_PGP); + $this->setCapaFromParams($oConfig, 'CapaGravatar',\RainLoopOld\Enumerations\Capa::GRAVATAR); + $this->setCapaFromParams($oConfig, 'CapaThemes',\RainLoopOld\Enumerations\Capa::THEMES); + $this->setCapaFromParams($oConfig, 'CapaUserBackground',\RainLoopOld\Enumerations\Capa::USER_BACKGROUND); + $this->setCapaFromParams($oConfig, 'CapaAttachmentThumbnails',\RainLoopOld\Enumerations\Capa::ATTACHMENT_THUMBNAILS); $this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool'); $this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool'); @@ -3912,7 +3912,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $this->loginErrorDelay(); $this->LoggerAuthHelper(null, $this->getAdditionalLogParamsByUserLogin($sLogin, true)); - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError); } $sToken = $this->getAdminToken(); @@ -4003,13 +4003,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } else { - $iErrorCode = \RainLoop\Notifications::LicensingServerIsUnavailable; + $iErrorCode =\RainLoopOld\Notifications::LicensingServerIsUnavailable; } } if (0 < $iErrorCode && !$mResult) { - throw new \RainLoop\Exceptions\ClientException($iErrorCode); + throw new\RainLoopOld\Exceptions\ClientException($iErrorCode); } return $this->DefaultResponse(__FUNCTION__, $mResult); @@ -4055,13 +4055,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } else { - $iErrorCode = \RainLoop\Notifications::LicensingServerIsUnavailable; + $iErrorCode =\RainLoopOld\Notifications::LicensingServerIsUnavailable; } } if (0 < $iErrorCode && !$mResult) { - throw new \RainLoop\Exceptions\ClientException($iErrorCode); + throw new\RainLoopOld\Exceptions\ClientException($iErrorCode); } return $this->DefaultResponse(__FUNCTION__, $mResult); @@ -4171,7 +4171,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this); return $this->DefaultResponse(__FUNCTION__, - $oDomain instanceof \RainLoop\Model\Domain ? $this->DomainProvider()->Save($oDomain) : false); + $oDomain instanceof\RainLoopOld\Model\Domain ? $this->DomainProvider()->Save($oDomain) : false); } /** @@ -4377,7 +4377,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oHttp = \MailSo\Base\Http::SingletonInstance(); - $sCacheKey = \RainLoop\KeyPathHelper::RepositoryCacheFile($sRepo, $sRepoFile); + $sCacheKey =\RainLoopOld\KeyPathHelper::RepositoryCacheFile($sRepo, $sRepoFile); $sRep = $this->Cacher()->Get($sCacheKey); if ('' !== $sRep) { @@ -4477,7 +4477,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oHttp = \MailSo\Base\Http::SingletonInstance(); - $sCacheKey = \RainLoop\KeyPathHelper::RepositoryCacheCore($sRepo); + $sCacheKey =\RainLoopOld\KeyPathHelper::RepositoryCacheCore($sRepo); $sRep = $this->Cacher()->Get($sCacheKey); if ('' !== $sRep) { @@ -4913,17 +4913,17 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$bDisable) { $oPlugin = $this->Plugins()->CreatePluginByName($sName); - if ($oPlugin && ($oPlugin instanceof \RainLoop\Plugins\AbstractPlugin)) + if ($oPlugin && ($oPlugin instanceof\RainLoopOld\Plugins\AbstractPlugin)) { $sValue = $oPlugin->Supported(); if (0 < \strlen($sValue)) { - return $this->FalseResponse(__FUNCTION__, \RainLoop\Notifications::UnsupportedPluginPackage, $sValue); + return $this->FalseResponse(__FUNCTION__,\RainLoopOld\Notifications::UnsupportedPluginPackage, $sValue); } } else { - return $this->FalseResponse(__FUNCTION__, \RainLoop\Notifications::InvalidPluginPackage); + return $this->FalseResponse(__FUNCTION__,\RainLoopOld\Notifications::InvalidPluginPackage); } } @@ -4957,7 +4957,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { foreach ($aMap as $oItem) { - if ($oItem && ($oItem instanceof \RainLoop\Plugins\Property)) + if ($oItem && ($oItem instanceof\RainLoopOld\Plugins\Property)) { $aItem = $oItem->ToArray(); $aItem[0] = $oConfig->Get('plugin', $oItem->Name(), ''); @@ -5002,21 +5002,21 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $mResultValue = null; switch ($oItem->Type()) { - case \RainLoop\Enumerations\PluginPropertyType::INT: + case\RainLoopOld\Enumerations\PluginPropertyType::INT: $mResultValue = (int) $sValue; break; - case \RainLoop\Enumerations\PluginPropertyType::BOOL: + case\RainLoopOld\Enumerations\PluginPropertyType::BOOL: $mResultValue = '1' === (string) $sValue; break; - case \RainLoop\Enumerations\PluginPropertyType::SELECTION: + case\RainLoopOld\Enumerations\PluginPropertyType::SELECTION: if (is_array($oItem->DefaultValue()) && in_array($sValue, $oItem->DefaultValue())) { $mResultValue = (string) $sValue; } break; - case \RainLoop\Enumerations\PluginPropertyType::PASSWORD: - case \RainLoop\Enumerations\PluginPropertyType::STRING: - case \RainLoop\Enumerations\PluginPropertyType::STRING_TEXT: + case\RainLoopOld\Enumerations\PluginPropertyType::PASSWORD: + case\RainLoopOld\Enumerations\PluginPropertyType::STRING: + case\RainLoopOld\Enumerations\PluginPropertyType::STRING_TEXT: $mResultValue = (string) $sValue; break; } @@ -5035,7 +5035,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$mResult) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSavePluginSettings); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSavePluginSettings); } return $this->DefaultResponse(__FUNCTION__, true); @@ -5047,7 +5047,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins public function DoSettingsUpdate() { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::SETTINGS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::SETTINGS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -5069,7 +5069,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oSettings->SetConf('Language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en'))); } - if ($this->GetCapa(false, false, \RainLoop\Enumerations\Capa::THEMES, $oAccount)) + if ($this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::THEMES, $oAccount)) { $this->setSettingsFromParams($oSettingsLocal, 'Theme', 'string', function ($sTheme) use ($self) { return $self->ValidateTheme($sTheme); @@ -5086,8 +5086,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $this->setSettingsFromParams($oSettings, 'Layout', 'int', function ($iValue) { return (int) (\in_array((int) $iValue, array(\RainLoop\Enumerations\Layout::NO_PREVIEW, - \RainLoop\Enumerations\Layout::SIDE_PREVIEW, \RainLoop\Enumerations\Layout::BOTTOM_PREVIEW)) ? - $iValue : \RainLoop\Enumerations\Layout::SIDE_PREVIEW); + \RainLoopOld\Enumerations\Layout::SIDE_PREVIEW,\RainLoopOld\Enumerations\Layout::BOTTOM_PREVIEW)) ? + $iValue :\RainLoopOld\Enumerations\Layout::SIDE_PREVIEW); }); $this->setSettingsFromParams($oSettings, 'EditorDefaultType', 'string'); @@ -5213,7 +5213,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins /** * @staticvar array $aCache - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return array */ @@ -5286,7 +5286,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param \MailSo\Mail\FolderCollection $oFolders * @param array $aResult * @param bool $bListFolderTypes = true @@ -5369,7 +5369,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oFolderCollection = null; $this->Plugins()->RunHook('filter.folders-before', array($oAccount, &$oFolderCollection)); - $bUseFolders = $this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount); + $bUseFolders = $this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount); if (null === $oFolderCollection) { @@ -5512,7 +5512,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -5527,7 +5527,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantCreateFolder, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantCreateFolder, $oException); } return $this->TrueResponse(__FUNCTION__); @@ -5540,7 +5540,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -5556,11 +5556,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { if ($bSubscribe) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSubscribeFolder, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSubscribeFolder, $oException); } else { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantUnsubscribeFolder, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantUnsubscribeFolder, $oException); } } @@ -5574,7 +5574,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -5626,7 +5626,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -5641,7 +5641,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantRenameFolder, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantRenameFolder, $oException); } return $this->TrueResponse(__FUNCTION__); @@ -5656,7 +5656,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::FOLDERS, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -5670,11 +5670,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\MailSo\Mail\Exceptions\NonEmptyFolder $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteNonEmptyFolder, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteNonEmptyFolder, $oException); } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteFolder, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteFolder, $oException); } return $this->TrueResponse(__FUNCTION__); @@ -5697,7 +5697,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); } return $this->TrueResponse(__FUNCTION__); @@ -5751,7 +5751,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); } if (\is_array($aInboxInformation)) @@ -5811,7 +5811,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins public function DoMessageList() { // \sleep(1); -// throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList); +// throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList); $sFolder = ''; $iOffset = 0; @@ -5857,7 +5857,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (0 === strlen($sFolder)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList); } $this->initMailClientConnection(); @@ -5880,7 +5880,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList, $oException); } if ($oMessageList instanceof \MailSo\Mail\MessageCollection) @@ -5892,7 +5892,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param bool $bWithDraftInfo = true * * @return \MailSo\Mime\Message @@ -6070,7 +6070,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return void */ @@ -6091,7 +6091,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * * @return \MailSo\Mime\Message */ @@ -6105,7 +6105,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (empty($sReadReceipt) || empty($sSubject) || empty($sText) || !$oIdentity) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); } $oMessage = \MailSo\Mime\Message::NewInstance(); @@ -6154,7 +6154,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::COMPOSER, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6165,7 +6165,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sDraftFolder = $this->GetActionParam('DraftFolder', ''); if (0 === strlen($sDraftFolder)) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::UnknownError); } $oMessage = $this->buildMessage($oAccount, true); @@ -6222,13 +6222,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins /** * - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param \MailSo\Mime\Message $oMessage * @param resource $rMessageStream * @param bool $bDsn = false * @param bool $bAddHiddenRcpt = true * - * @throws \RainLoop\Exceptions\ClientException + * @throws\RainLoopOld\Exceptions\ClientException * @throws \MailSo\Net\Exceptions\ConnectionException */ private function smtpSendMessage($oAccount, $oMessage, @@ -6259,7 +6259,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $bUsePhpMail = $oAccount->Domain()->OutUsePhpMail(); $oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance()->SetLogger($this->Logger()); - $oSmtpClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'smtp_timeout', 60)); + $oSmtpClient->SetTimeOuts(10, (int)\RainLoopOld\Api::Config()->Get('labs', 'smtp_timeout', 60)); $bLoggined = $oAccount->OutConnectAndLoginHelper( $this->Plugins(), $oSmtpClient, $this->Config(), array($this, 'googleRefreshTokenCallback'), $bUsePhpMail @@ -6305,14 +6305,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$bR) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); } } } } else { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); } } else if ($oSmtpClient->IsConnected()) @@ -6353,22 +6353,22 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { if ($this->Config()->Get('labs', 'smtp_show_server_errors')) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ClientViewError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::ClientViewError, $oException); } else { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException); } } catch (\MailSo\Smtp\Exceptions\LoginException $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); } catch (\Exception $oException) { if ($this->Config()->Get('labs', 'smtp_show_server_errors')) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ClientViewError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::ClientViewError, $oException); } else { @@ -6378,7 +6378,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } else { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidRecipients); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::InvalidRecipients); } } @@ -6389,7 +6389,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::COMPOSER, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6497,7 +6497,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSaveMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSaveMessage, $oException); } } @@ -6530,12 +6530,12 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage, $oException); } if (false === $mResult) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); } try @@ -6579,7 +6579,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::COMPOSER, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6635,12 +6635,12 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage, $oException); } if (false === $mResult) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); } return $this->TrueResponse(__FUNCTION__); @@ -6653,7 +6653,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::QUOTA, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::QUOTA, $oAccount)) { return $this->DefaultResponse(__FUNCTION__, array(0, 0, 0, 0)); } @@ -6664,7 +6664,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); } return $this->DefaultResponse(__FUNCTION__, $aQuota); @@ -6675,13 +6675,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mResult = null; $sData = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'contacts_sync' ); if (!empty($sData)) { - $mData = \RainLoop\Utils::DecodeKeyValues($sData); + $mData =\RainLoopOld\Utils::DecodeKeyValues($sData); if (\is_array($mData)) { $mResult = array( @@ -6717,9 +6717,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mData = $this->getContactsSyncData($oAccount); $bResult = $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'contacts_sync', - \RainLoop\Utils::EncodeKeyValues(array( + \RainLoopOld\Utils::EncodeKeyValues(array( 'Enable' => $bEnabled, 'User' => $sUser, 'Password' => APP_DUMMY === $sPassword && isset($mData['Password']) ? @@ -6753,7 +6753,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$bResult) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError); } return $this->TrueResponse(__FUNCTION__); @@ -6779,13 +6779,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['User'] = $sEmail; $sData = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'two_factor' ); if ($sData) { - $mData = \RainLoop\Utils::DecodeKeyValues($sData); + $mData =\RainLoopOld\Utils::DecodeKeyValues($sData); } } @@ -6822,7 +6822,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param string $sCode * * @return bool @@ -6835,13 +6835,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } $sData = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'two_factor' ); if ($sData) { - $mData = \RainLoop\Utils::DecodeKeyValues($sData); + $mData =\RainLoopOld\Utils::DecodeKeyValues($sData); if (!empty($mData['BackupCodes'])) { @@ -6851,9 +6851,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mData['BackupCodes'] = \trim(\preg_replace('/[^\d]+/', ' ', $sBackupCodes)); return $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'two_factor', - \RainLoop\Utils::EncodeKeyValues($mData) + \RainLoopOld\Utils::EncodeKeyValues($mData) ); } } @@ -6869,7 +6869,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); if (!$this->TwoFactorAuthProvider()->IsActive() || - !$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount)) + !$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6886,7 +6886,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); if (!$this->TwoFactorAuthProvider()->IsActive() || - !$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount)) + !$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6902,9 +6902,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'two_factor', - \RainLoop\Utils::EncodeKeyValues(array( + \RainLoopOld\Utils::EncodeKeyValues(array( 'User' => $sEmail, 'Enable' => false, 'Secret' => $sSecret, @@ -6926,7 +6926,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); if (!$this->TwoFactorAuthProvider()->IsActive() || - !$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount)) + !$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6948,7 +6948,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); if (!$this->TwoFactorAuthProvider()->IsActive() || - !$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount)) + !$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -6960,9 +6960,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (isset($mData['Secret'], $mData['BackupCodes'])) { $bResult = $this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'two_factor', - \RainLoop\Utils::EncodeKeyValues(array( + \RainLoopOld\Utils::EncodeKeyValues(array( 'User' => $sEmail, 'Enable' => '1' === \trim($this->GetActionParam('Enable', '0')), 'Secret' => $mData['Secret'], @@ -6982,7 +6982,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); if (!$this->TwoFactorAuthProvider()->IsActive() || - !$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount)) + !$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -7011,13 +7011,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); if (!$this->TwoFactorAuthProvider()->IsActive() || - !$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::TWO_FACTOR, $oAccount)) + !$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::TWO_FACTOR, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } $this->StorageProvider()->Clear($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'two_factor' ); @@ -7100,7 +7100,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!$oContact) { - $oContact = new \RainLoop\Providers\AddressBook\Classes\Contact(); + $oContact = new\RainLoopOld\Providers\AddressBook\Classes\Contact(); if (0 < \strlen($sUid)) { $oContact->IdContact = $sUid; @@ -7115,7 +7115,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { if ($aItem && isset($aItem[0], $aItem[1]) && \is_numeric($aItem[0])) { - $oProp = new \RainLoop\Providers\AddressBook\Classes\Property(); + $oProp = new\RainLoopOld\Providers\AddressBook\Classes\Property(); $oProp->Type = (int) $aItem[0]; $oProp->Value = $aItem[1]; $oProp->TypeStr = empty($aItem[2]) ? '': $aItem[2]; @@ -7203,7 +7203,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } - $aResult = \RainLoop\Utils::RemoveSuggestionDuplicates($aResult); + $aResult =\RainLoopOld\Utils::RemoveSuggestionDuplicates($aResult); if ($iLimit < \count($aResult)) { $aResult = \array_slice($aResult, 0, $iLimit); @@ -7211,7 +7211,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $this->Plugins()->RunHook('ajax.suggestions-post', array(&$aResult, $sQuery, $oAccount, $iLimit)); - $aResult = \RainLoop\Utils::RemoveSuggestionDuplicates($aResult); + $aResult =\RainLoopOld\Utils::RemoveSuggestionDuplicates($aResult); if ($iLimit < \count($aResult)) { $aResult = \array_slice($aResult, 0, $iLimit); @@ -7239,7 +7239,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); } return $this->TrueResponse($sResponseFunction); @@ -7271,7 +7271,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); } return $this->TrueResponse(__FUNCTION__); @@ -7322,7 +7322,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessage, $oException); } if ($oMessage instanceof \MailSo\Mail\Message) @@ -7359,7 +7359,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteMessage, $oException); } if ($this->Config()->Get('labs', 'use_imap_unselect', true)) @@ -7425,7 +7425,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantMoveMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantMoveMessage, $oException); } if ($this->Config()->Get('labs', 'use_imap_unselect', true)) @@ -7478,7 +7478,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantCopyMessage, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::CantCopyMessage, $oException); } return $this->DefaultResponse(__FUNCTION__, @@ -7525,7 +7525,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mResult = array(); foreach ($aAttachments as $sAttachment) { - $aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment); + $aValues =\RainLoopOld\Utils::DecodeKeyValuesQ($sAttachment); if (\is_array($aValues)) { $sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : ''; @@ -7559,7 +7559,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::MailServerError, $oException); } return $this->DefaultResponse(__FUNCTION__, $mResult); @@ -7766,14 +7766,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResponse = array(); $aFile = $this->GetActionParam('File', null); - $iError = $this->GetActionParam('Error', \RainLoop\Enumerations\UploadError::UNKNOWN); + $iError = $this->GetActionParam('Error',\RainLoopOld\Enumerations\UploadError::UNKNOWN); if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) { $sSavedName = 'upload-post-'.\md5($aFile['name'].$aFile['tmp_name']); if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) { - $iError = \RainLoop\Enumerations\UploadError::ON_SAVING; + $iError =\RainLoopOld\Enumerations\UploadError::ON_SAVING; } else { @@ -7792,7 +7792,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (UPLOAD_ERR_OK !== $iError) { - $iClientError = \RainLoop\Enumerations\UploadClientError::NORMAL; + $iClientError =\RainLoopOld\Enumerations\UploadClientError::NORMAL; $sError = $this->getUploadErrorMessageByCode($iError, $iClientError); if (!empty($sError)) @@ -7812,7 +7812,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::USER_BACKGROUND, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::USER_BACKGROUND, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -7821,7 +7821,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($oAccount && $oSettings) { $this->StorageProvider()->Clear($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'background' ); @@ -7840,7 +7840,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); - if (!$this->GetCapa(false, false, \RainLoop\Enumerations\Capa::USER_BACKGROUND, $oAccount)) + if (!$this->GetCapa(false, false,\RainLoopOld\Enumerations\Capa::USER_BACKGROUND, $oAccount)) { return $this->FalseResponse(__FUNCTION__); } @@ -7849,7 +7849,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sHash = ''; $aFile = $this->GetActionParam('File', null); - $iError = $this->GetActionParam('Error', \RainLoop\Enumerations\UploadError::UNKNOWN); + $iError = $this->GetActionParam('Error',\RainLoopOld\Enumerations\UploadError::UNKNOWN); if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) { @@ -7859,7 +7859,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sSavedName = 'upload-post-'.\md5($aFile['name'].$aFile['tmp_name']); if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) { - $iError = \RainLoop\Enumerations\UploadError::ON_SAVING; + $iError =\RainLoopOld\Enumerations\UploadError::ON_SAVING; } else { @@ -7876,7 +7876,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } if ($this->StorageProvider()->Put($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'background', \json_encode(array( 'Name' => $aFile['name'], @@ -7912,13 +7912,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } else { - $iError = \RainLoop\Enumerations\UploadError::FILE_TYPE; + $iError =\RainLoopOld\Enumerations\UploadError::FILE_TYPE; } } if (UPLOAD_ERR_OK !== $iError) { - $iClientError = \RainLoop\Enumerations\UploadClientError::NORMAL; + $iClientError =\RainLoopOld\Enumerations\UploadClientError::NORMAL; $sError = $this->getUploadErrorMessageByCode($iError, $iClientError); if (!empty($sError)) @@ -7943,14 +7943,14 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $mResponse = false; $aFile = $this->GetActionParam('File', null); - $iError = $this->GetActionParam('Error', \RainLoop\Enumerations\UploadError::UNKNOWN); + $iError = $this->GetActionParam('Error',\RainLoopOld\Enumerations\UploadError::UNKNOWN); if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) { $sSavedName = 'upload-post-'.\md5($aFile['name'].$aFile['tmp_name']); if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) { - $iError = \RainLoop\Enumerations\UploadError::ON_SAVING; + $iError =\RainLoopOld\Enumerations\UploadError::ON_SAVING; } else { @@ -7989,7 +7989,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (UPLOAD_ERR_OK !== $iError) { - $iClientError = \RainLoop\Enumerations\UploadClientError::NORMAL; + $iClientError =\RainLoopOld\Enumerations\UploadClientError::NORMAL; $sError = $this->getUploadErrorMessageByCode($iError, $iClientError); if (!empty($sError)) @@ -8002,7 +8002,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param resource $rFile * @param string $sFileStart * @@ -8062,7 +8062,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param resource $rFile * * @return int @@ -8130,7 +8130,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aParams = $this->GetActionParam('Params', null); $this->Http()->ServerNoCache(); - $aData = \RainLoop\Utils::DecodeKeyValuesQ($sRawKey); + $aData =\RainLoopOld\Utils::DecodeKeyValuesQ($sRawKey); if (isset($aParams[0], $aParams[1], $aParams[2]) && 'Raw' === $aParams[0] && 'FramedView' === $aParams[2] && isset($aData['Framed']) && $aData['Framed'] && $aData['FileName']) { @@ -8175,7 +8175,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sFolderFullNameRaw = $this->GetActionParam('Folder', ''); $_FILES = isset($_FILES) ? $_FILES : null; - if ($oAccount instanceof \RainLoop\Model\Account && + if ($oAccount instanceof\RainLoopOld\Model\Account && $this->Config()->Get('labs', 'allow_message_append', false) && isset($_FILES, $_FILES['AppendFile'], $_FILES['AppendFile']['name'], $_FILES['AppendFile']['tmp_name'], $_FILES['AppendFile']['size'])) @@ -8206,7 +8206,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins /** * @param bool $bAdmin * @param bool $bMobile = false - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * * @return array */ @@ -8218,69 +8218,69 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($oConfig->Get('capa', 'folders', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::FOLDERS; + $aResult[] =\RainLoopOld\Enumerations\Capa::FOLDERS; if ($oConfig->Get('capa', 'messagelist_actions', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::MESSAGELIST_ACTIONS; + $aResult[] =\RainLoopOld\Enumerations\Capa::MESSAGELIST_ACTIONS; if ($oConfig->Get('capa', 'dangerous_actions', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::DANGEROUS_ACTIONS; + $aResult[] =\RainLoopOld\Enumerations\Capa::DANGEROUS_ACTIONS; } } } if ($oConfig->Get('capa', 'reload', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::RELOAD; + $aResult[] =\RainLoopOld\Enumerations\Capa::RELOAD; } if ($oConfig->Get('capa', 'quota', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::QUOTA; + $aResult[] =\RainLoopOld\Enumerations\Capa::QUOTA; } if ($oConfig->Get('capa', 'settings', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::SETTINGS; + $aResult[] =\RainLoopOld\Enumerations\Capa::SETTINGS; if ($oConfig->Get('webmail', 'allow_additional_accounts', false)) { - $aResult[] = \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS; + $aResult[] =\RainLoopOld\Enumerations\Capa::ADDITIONAL_ACCOUNTS; } if ($oConfig->Get('webmail', 'allow_additional_identities', false)) { - $aResult[] = \RainLoop\Enumerations\Capa::IDENTITIES; + $aResult[] =\RainLoopOld\Enumerations\Capa::IDENTITIES; } if ($oConfig->Get('capa', 'x-templates', true) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::TEMPLATES; + $aResult[] =\RainLoopOld\Enumerations\Capa::TEMPLATES; } if ($oConfig->Get('webmail', 'allow_themes', false) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::THEMES; + $aResult[] =\RainLoopOld\Enumerations\Capa::THEMES; } if ($oConfig->Get('webmail', 'allow_user_background', false) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::USER_BACKGROUND; + $aResult[] =\RainLoopOld\Enumerations\Capa::USER_BACKGROUND; } if ($oConfig->Get('security', 'openpgp', false) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::OPEN_PGP; + $aResult[] =\RainLoopOld\Enumerations\Capa::OPEN_PGP; } if ($oConfig->Get('capa', 'filters', false)) { - $aResult[] = \RainLoop\Enumerations\Capa::FILTERS; + $aResult[] =\RainLoopOld\Enumerations\Capa::FILTERS; if ($bAdmin || ($oAccount && $oAccount->Domain()->UseSieve())) { - $aResult[] = \RainLoop\Enumerations\Capa::SIEVE; + $aResult[] =\RainLoopOld\Enumerations\Capa::SIEVE; } } } @@ -8288,68 +8288,68 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if ($oConfig->Get('security', 'allow_two_factor_auth', false) && ($bAdmin || ($oAccount && !$oAccount->IsAdditionalAccount()))) { - $aResult[] = \RainLoop\Enumerations\Capa::TWO_FACTOR; + $aResult[] =\RainLoopOld\Enumerations\Capa::TWO_FACTOR; if ($oConfig->Get('security', 'force_two_factor_auth', false) && ($bAdmin || ($oAccount && !$oAccount->IsAdditionalAccount()))) { - $aResult[] = \RainLoop\Enumerations\Capa::TWO_FACTOR_FORCE; + $aResult[] =\RainLoopOld\Enumerations\Capa::TWO_FACTOR_FORCE; } } if ($oConfig->Get('capa', 'help', true) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::HELP; + $aResult[] =\RainLoopOld\Enumerations\Capa::HELP; } if ($oConfig->Get('capa', 'attachments_actions', false)) { - $aResult[] = \RainLoop\Enumerations\Capa::ATTACHMENTS_ACTIONS; + $aResult[] =\RainLoopOld\Enumerations\Capa::ATTACHMENTS_ACTIONS; } if ($oConfig->Get('capa', 'message_actions', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::MESSAGE_ACTIONS; + $aResult[] =\RainLoopOld\Enumerations\Capa::MESSAGE_ACTIONS; } if ($oConfig->Get('capa', 'composer', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::COMPOSER; + $aResult[] =\RainLoopOld\Enumerations\Capa::COMPOSER; if ($oConfig->Get('capa', 'contacts', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::CONTACTS; + $aResult[] =\RainLoopOld\Enumerations\Capa::CONTACTS; } } if ($oConfig->Get('capa', 'search', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::SEARCH; + $aResult[] =\RainLoopOld\Enumerations\Capa::SEARCH; if ($oConfig->Get('capa', 'search_adv', true) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::SEARCH_ADV; + $aResult[] =\RainLoopOld\Enumerations\Capa::SEARCH_ADV; } } if ($oConfig->Get('labs', 'allow_gravatar', false)) { - $aResult[] = \RainLoop\Enumerations\Capa::GRAVATAR; + $aResult[] =\RainLoopOld\Enumerations\Capa::GRAVATAR; } if ($oConfig->Get('interface', 'show_attachment_thumbnail', true)) { - $aResult[] = \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS; + $aResult[] =\RainLoopOld\Enumerations\Capa::ATTACHMENT_THUMBNAILS; } if ($oConfig->Get('labs', 'allow_prefetch', false) && !$bMobile) { - $aResult[] = \RainLoop\Enumerations\Capa::PREFETCH; + $aResult[] =\RainLoopOld\Enumerations\Capa::PREFETCH; } if (!\RainLoop\Utils::IsOwnCloud()) { - $aResult[] = \RainLoop\Enumerations\Capa::AUTOLOGOUT; + $aResult[] =\RainLoopOld\Enumerations\Capa::AUTOLOGOUT; } return $aResult; @@ -8359,7 +8359,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins * @param bool $bAdmin * @param bool $bMobile * @param string $sName - * @param \RainLoop\Model\Account $oAccount = null + * @param\RainLoopOld\Model\Account $oAccount = null * * @return bool */ @@ -8426,7 +8426,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @param \RainLoop\Model\Account $oAccount + * @param\RainLoopOld\Model\Account $oAccount * @param string $sHash * * @return array @@ -8820,7 +8820,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $oAccount = $this->getAccountFromToken(); $sData = $this->StorageProvider()->Get($oAccount, - \RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, + \RainLoopOld\Providers\Storage\Enumerations\StorageType::CONFIG, 'background' ); @@ -8859,8 +8859,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins if (!empty($sHash)) { $sData = $this->StorageProvider()->Get(null, - \RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY, - \RainLoop\KeyPathHelper::PublicFile($sHash) + \RainLoopOld\Providers\Storage\Enumerations\StorageType::NOBODY, + \RainLoopOld\KeyPathHelper::PublicFile($sHash) ); } @@ -9029,7 +9029,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } /** - * @return \RainLoop\Model\Account|bool + * @return\RainLoopOld\Model\Account|bool */ private function initMailClientConnection() { @@ -9045,11 +9045,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } catch (\MailSo\Net\Exceptions\ConnectionException $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException); } catch (\Exception $oException) { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); + throw new\RainLoopOld\Exceptions\ClientException(\RainLoop\Notifications::AuthError, $oException); } $this->MailClient()->ImapClient()->__FORCE_SELECT_ON_EXAMINE__ = !!$this->Config()->Get('labs', 'use_imap_force_selection'); @@ -9068,7 +9068,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $bResult = false; if (!empty($sRawKey)) { - $aValues = \RainLoop\Utils::DecodeKeyValuesQ($sRawKey); + $aValues =\RainLoopOld\Utils::DecodeKeyValuesQ($sRawKey); if (is_array($aValues)) { $bResult = $aValues; @@ -9367,7 +9367,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sHtml = \preg_replace('/