Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-10 06:58:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge new-contacts-api

Browse source 
New interface
Contact storage move to plugin
This commit is contained in:
RainLoop Team 2013-12-07 02:07:29 +04:00
commit efdca7ef77
44 changed files with 3454 additions and 1012 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
View file

@ -1090,6 +1090,11 @@ class Utils
*/
public static function Utf8Clear($sUtfString, $sReplaceOn = '')
{
if ('' === $sUtfString)
{
return $sUtfString;
}
$sUtfString = @\iconv('UTF-8', 'UTF-8//IGNORE', $sUtfString);
$sUtfString = \preg_replace(

355
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -77,9 +77,9 @@ class Actions
private $oLoginProvider;
/**
* @var \RainLoop\Providers\Contacts
* @var \RainLoop\Providers\PersonalAddressBook
*/
private $oContactsProvider;
private $oPersonalAddressBookProvider;
/**
* @var \RainLoop\Providers\Suggestions
@ -121,6 +121,7 @@ class Actions
$this->oSettingsProvider = null;
$this->oDomainProvider = null;
$this->oLoginProvider = null;
$this->oPersonalAddressBookProvider = null;
$this->oSuggestionsProvider = null;
$this->oChangePasswordProvider = null;
@ -222,9 +223,8 @@ class Actions
// \RainLoop\Providers\Domain\DomainAdminInterface
$oResult = new \RainLoop\Providers\Domain\DefaultDomain(APP_PRIVATE_DATA.'domains');
break;
case 'contacts':
// \RainLoop\Providers\Contacts\ContactsInterface
$oResult = new \RainLoop\Providers\Contacts\DefaultContacts($this->Logger());
case 'personal-address-book':
// \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface
break;
case 'suggestions':
// \RainLoop\Providers\Suggestions\SuggestionsInterface
@ -529,18 +529,36 @@ class Actions
}
/**
* @return \RainLoop\Providers\Contacts
* @return \RainLoop\Providers\PersonalAddressBook
*/
public function ContactsProvider()
public function PersonalAddressBookProvider($oAccount = null)
{
if (null === $this->oContactsProvider)
if (null === $this->oPersonalAddressBookProvider)
{
$this->oContactsProvider = new \RainLoop\Providers\Contacts(
$this->Config()->Get('labs', 'allow_contacts', true) ?
$this->fabrica('contacts') : null);
$this->oPersonalAddressBookProvider = new \RainLoop\Providers\PersonalAddressBook(
$this->fabrica('personal-address-book', $oAccount));
$sPabVersion = $this->oPersonalAddressBookProvider->Version();
$sVersion = (string) $this->StorageProvider()->Get(null,
\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY, 'PersonalAddressBookVersion', '');
if ($sVersion !== $sPabVersion &&
$this->oPersonalAddressBookProvider->IsActive())
{
if ($this->oPersonalAddressBookProvider->SynchronizeStorage())
{
$this->StorageProvider()->Put(null, \RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
'PersonalAddressBookVersion', $sPabVersion);
}
}
}
return $this->oContactsProvider;
if ($oAccount)
{
$this->oPersonalAddressBookProvider->SetAccount($oAccount);
}
return $this->oPersonalAddressBookProvider;
}
/**
@ -877,9 +895,8 @@ class Actions
'AllowThemes' => (bool) $oConfig->Get('webmail', 'allow_themes', true),
'AllowCustomTheme' => (bool) $oConfig->Get('webmail', 'allow_custom_theme', true),
'SuggestionsLimit' => (int) $oConfig->Get('labs', 'suggestions_limit', 50),
'AllowChangePassword' => false,
'ContactsIsSupported' => (bool) $this->ContactsProvider()->IsSupported(),
'ContactsIsAllowed' => (bool) $this->ContactsProvider()->IsActive(),
'ChangePasswordIsAllowed' => false,
'ContactsIsAllowed' => false,
'JsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),
'UseImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false),
'UseImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true),
@ -904,7 +921,8 @@ class Actions
$aResult['IncLogin'] = $oAccount->IncLogin();
$aResult['OutLogin'] = $oAccount->OutLogin();
$aResult['AccountHash'] = $oAccount->Hash();
$aResult['AllowChangePassword'] = $this->ChangePasswordProvider()->PasswordChangePossibility($oAccount);
$aResult['ChangePasswordIsAllowed'] = $this->ChangePasswordProvider()->PasswordChangePossibility($oAccount);
$aResult['ContactsIsAllowed'] = $this->PersonalAddressBookProvider($oAccount)->IsActive();
$oSettings = $this->SettingsProvider()->Load($oAccount);
}
@ -3745,10 +3763,10 @@ class Actions
$this->Plugins()->RunHook('filter.smtp-credentials', array($oAccount, &$aSmtpCredentials));
$bHookConnect = $bHookAuth = $bHookFrom = $bHookFrom = $bHookTo = $bHookData = false;
$bHookConnect = $bHookAuth = $bHookFrom = $bHookFrom = $bHookTo = $bHookData = $bHookLogoutAndDisconnect = false;
$this->Plugins()->RunHook('filter.smtp-connect', array($oAccount, $aSmtpCredentials,
&$oSmtpClient, $oMessage, &$oRcpt,
&$bHookConnect, &$bHookAuth, &$bHookFrom, &$bHookTo, &$bHookData));
&$bHookConnect, &$bHookAuth, &$bHookFrom, &$bHookTo, &$bHookData, &$bHookLogoutAndDisconnect));
if (!$bHookConnect)
{
@ -3794,7 +3812,10 @@ class Actions
$oSmtpClient->DataWithStream($rMessageStream);
}
$oSmtpClient->LogoutAndDisconnect();
if (!$bHookLogoutAndDisconnect)
{
$oSmtpClient->LogoutAndDisconnect();
}
}
catch (\MailSo\Net\Exceptions\ConnectionException $oException)
{
@ -3849,22 +3870,6 @@ class Actions
$rMessageStream, $iMessageStreamSize, $sSentFolder, array(
\MailSo\Imap\Enumerations\MessageFlag::SEEN
));
// TODO
// $rAppendMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
//
// $iAppendMessageStreamSize = \MailSo\Base\Utils::MultipleStreamWriter(
// $oMessage->ToStream(false), array($rAppendMessageStream), 8192, true, true, true);
//
// $this->MailClient()->MessageAppendStream(
// $rAppendMessageStream, $iAppendMessageStreamSize, $sSentFolder, array(
// \MailSo\Imap\Enumerations\MessageFlag::SEEN
// ));
//
// if (\is_resource($rAppendMessageStream))
// {
// @\fclose($rAppendMessageStream);
// }
}
catch (\Exception $oException)
{
@ -3912,26 +3917,24 @@ class Actions
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage);
}
// if ($oMessage && $this->ContactsProvider()->IsActive())
// {
// $oToCollection = $oMessage->GetTo();
// $oTo = $oToCollection->GetByIndex(0);
// if ($oTo)
// {
// $oContact = new \RainLoop\Providers\Contacts\Classes\Contact();
// /* @var $oTo \MailSo\Mime\Email */
// $oContact->Name = $oTo->GetDisplayName();
//
// $i = 30;
// while ($i > 0)
// {
// $i--;
// $oContact->Emails = array('u'.$i.'-'.$oTo->GetEmail());
// $this->ContactsProvider()->CreateContact($oAccount, $oContact);
// }
// }
//
// }
if ($oMessage && $this->PersonalAddressBookProvider($oAccount)->IsActive())
{
$aArrayToFrec = array();
$oToCollection = $oMessage->GetTo();
if ($oToCollection)
{
$aTo =& $oToCollection->GetAsArray();
foreach ($aTo as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
{
$aArrayToFrec[$oEmail->GetEmail()] = $oEmail->ToString();
}
}
if (0 < \count($aArrayToFrec))
{
$this->PersonalAddressBookProvider($oAccount)->IncFrec($oAccount, \array_values($aArrayToFrec));
}
}
return $this->TrueResponse(__FUNCTION__);
}
@ -3961,30 +3964,27 @@ class Actions
public function DoContacts()
{
$oAccount = $this->getAccountFromToken();
$sSearch = \trim($this->GetActionParam('Search', ''));
$iOffset = (int) $this->GetActionParam('Offset', 0);
$iLimit = (int) $this->GetActionParam('Limit', 20);
$iOffset = 0 > $iOffset ? 0 : $iOffset;
$iLimit = 0 > $iLimit ? 20 : $iLimit;
$bMore = false;
$mResult = false;
if ($this->ContactsProvider()->IsActive())
if ($this->PersonalAddressBookProvider($oAccount)->IsActive())
{
$mResult = $this->ContactsProvider()->GetContacts($oAccount, 0, RL_CONTACTS_MAX + 1, $sSearch);
if (is_array($mResult))
{
$bMore = RL_CONTACTS_MAX < \count($mResult);
if ($bMore)
{
$mResult = \array_slice($mResult, 0, RL_CONTACTS_MAX);
}
}
$mResult = $this->PersonalAddressBookProvider($oAccount)->GetContacts($oAccount,
$iOffset, $iLimit, $sSearch, false);
}
return $this->DefaultResponse(__FUNCTION__, array(
'Limit' => RL_CONTACTS_MAX,
'More' => $bMore,
'Offset' => $iOffset,
'Limit' => $iLimit,
'Search' => $sSearch,
'List' => $mResult
));
}
/**
* @return array
*/
@ -3999,9 +3999,9 @@ class Actions
});
$bResult = false;
if ($this->ContactsProvider()->IsActive())
if (0 < \count($aFilteredUids) && $this->PersonalAddressBookProvider($oAccount)->IsActive())
{
$bResult = $this->ContactsProvider()->DeleteContacts($oAccount, $aFilteredUids);
$bResult = $this->PersonalAddressBookProvider($oAccount)->DeleteContacts($oAccount, $aFilteredUids);
}
return $this->DefaultResponse(__FUNCTION__, $bResult);
@ -4012,77 +4012,45 @@ class Actions
*/
public function DoContactSave()
{
sleep(1);
$oAccount = $this->getAccountFromToken();
$bResult = false;
$sResultID = '';
$oPab = $this->PersonalAddressBookProvider($oAccount);
$sRequestUid = \trim($this->GetActionParam('RequestUid', ''));
if ($this->ContactsProvider()->IsActive() && 0 < \strlen($sRequestUid))
if ($oPab && $oPab->IsActive() && 0 < \strlen($sRequestUid))
{
$sUid = \trim($this->GetActionParam('Uid', ''));
$sName = \trim($this->GetActionParam('Name', ''));
$sEmail = \trim($this->GetActionParam('Email', ''));
$sImageData = \trim($this->GetActionParam('ImageData', ''));
$oContact = null;
$oContact = new \RainLoop\Providers\PersonalAddressBook\Classes\Contact();
if (0 < \strlen($sUid))
{
if (\is_numeric($sUid))
{
$oContact = $this->ContactsProvider()->GetContactById($oAccount, (int) $sUid);
}
}
else
{
$oContact = new \RainLoop\Providers\Contacts\Classes\Contact();
$oContact->IdContact = $sUid;
}
if ($oContact)
$aProperties = $this->GetActionParam('Properties', array());
if (\is_array($aProperties))
{
$oContact->Name = $sName;
$oContact->Emails = array($sEmail);
if (0 < \strlen($sImageData) && 'data:image/' === substr($sImageData, 0, 11))
foreach ($aProperties as $aItem)
{
$oContact->ImageHash = \md5($sImageData);
}
if (0 < $oContact->IdContact)
{
$bResult = $this->ContactsProvider()->UpdateContact($oAccount, $oContact);
}
else
{
$bResult = $this->ContactsProvider()->CreateContact($oAccount, $oContact);
}
if ($bResult && 0 < $oContact->IdContact)
{
$sResultID = $oContact->IdContact;
$aMatches = array();
if ($bResult && $oContact && 0 < $oContact->IdContact && 0 < \strlen($oContact->ImageHash) &&
0 < \strlen($sImageData) &&
\preg_match('/^data:(image\/(jpeg|jpg|png|bmp));base64,(.+)$/i', $sImageData, $aMatches) &&
!empty($aMatches[1]) && !empty($aMatches[3]))
if ($aItem && isset($aItem[0], $aItem[1]) &&
\is_numeric($aItem[0]))
{
$this->StorageProvider()->Put($oAccount,
\RainLoop\Providers\Storage\Enumerations\StorageType::USER,
'contacts/'.$oContact->ImageHash, $aMatches[1].'|||'.$aMatches[3]);
$oProp = new \RainLoop\Providers\PersonalAddressBook\Classes\Property();
$oProp->Type = (int) $aItem[0];
$oProp->Value = $aItem[1];
$oContact->Properties[] = $oProp;
}
}
else
{
$bResult = false;
}
}
$bResult = $oPab->ContactSave($oAccount, $oContact);
}
return $this->DefaultResponse(__FUNCTION__, array(
'RequestUid' => $sRequestUid,
'ResultID' => $sResultID,
'ResultID' => $bResult ? $oContact->IdContact : '',
'Result' => $bResult
));
}
@ -4097,114 +4065,13 @@ class Actions
$sQuery = \trim($this->GetActionParam('Query', ''));
$aResult = array();
if (0 < \strlen($sQuery) && $this->ContactsProvider()->IsActive())
$oPab = $this->PersonalAddressBookProvider($oAccount);
if (0 < \strlen($sQuery) && $oPab->IsActive())
{
$mResult = $this->ContactsProvider()->GetContacts($oAccount, 0, RL_CONTACTS_PER_PAGE, $sQuery);
if (\is_array($mResult) && 0 < \count($mResult))
{
$mResult = \array_slice($mResult, 0, RL_CONTACTS_PER_PAGE);
foreach ($mResult as $oItem)
{
/* @var $oItem \RainLoop\Providers\Contacts\Classes\Contact */
$aEmails = $oItem->Emails;
if (0 < \count($aEmails))
{
foreach ($aEmails as $sEmail)
{
if (0 < \strlen($sEmail))
{
$aResult[] = array($sEmail, $oItem->Name);
}
}
}
}
}
$aResult = $oPab->GetSuggestions($oAccount, $sQuery);
}
return $this->DefaultResponse(__FUNCTION__, array(
'More' => false,
'List' => $aResult
));
// $oAccount = $this->getAccountFromToken();
//
// $aResult = array();
// $sQuery = \trim($this->GetActionParam('Query', ''));
// if (0 < \strlen($sQuery) && $oAccount)
// {
// $aResult = $this->SuggestionsProvider()->Process($oAccount, $sQuery);
//
// if (0 === count($aResult) && false !== \strpos(strtolower($oAccount->Email()), \strtolower($sQuery)))
// {
// $aResult[] = array($oAccount->Email(), $oAccount->Name());
// }
// }
//
// return $this->DefaultResponse(__FUNCTION__, $aResult);
}
/**
* @return array
*/
public function DoSuggestionsDep()
{
$oAccount = $this->getAccountFromToken();
$sQuery = \trim($this->GetActionParam('Query', ''));
$iPage = (int) $this->GetActionParam('Page', 0);
$bMore = false;
$aResult = array();
if (0 < \strlen($sQuery) && 0 < $iPage && $this->ContactsProvider()->IsActive())
{
$mResult = $this->ContactsProvider()->GetContacts($oAccount, ($iPage - 1) * RL_CONTACTS_PER_PAGE, RL_CONTACTS_PER_PAGE + 1, $sQuery);
if (\is_array($mResult) && 0 < \count($mResult))
{
$bMore = RL_CONTACTS_PER_PAGE < \count($mResult);
if ($bMore)
{
$mResult = \array_slice($mResult, 0, RL_CONTACTS_PER_PAGE);
}
foreach ($mResult as $oItem)
{
/* @var $oItem \RainLoop\Providers\Contacts\Classes\Contact */
$aEmails = $oItem->Emails;
if (0 < \count($aEmails))
{
foreach ($aEmails as $sEmail)
{
if (0 < \strlen($sEmail))
{
$aResult[] = array($sEmail, $oItem->Name);
}
}
}
}
}
}
return $this->DefaultResponse(__FUNCTION__, array(
'More' => $bMore,
'List' => $aResult
));
// $oAccount = $this->getAccountFromToken();
//
// $aResult = array();
// $sQuery = \trim($this->GetActionParam('Query', ''));
// if (0 < \strlen($sQuery) && $oAccount)
// {
// $aResult = $this->SuggestionsProvider()->Process($oAccount, $sQuery);
//
// if (0 === count($aResult) && false !== \strpos(strtolower($oAccount->Email()), \strtolower($sQuery)))
// {
// $aResult[] = array($oAccount->Email(), $oAccount->Name());
// }
// }
//
// return $this->DefaultResponse(__FUNCTION__, $aResult);
return $this->DefaultResponse(__FUNCTION__, $aResult);
}
/**
@ -4212,19 +4079,8 @@ class Actions
*/
public function DoEmailsPicsHashes()
{
$oAccount = $this->getAccountFromToken();
$aResult = array();
if ($this->ContactsProvider()->IsActive())
{
$mResult = $this->ContactsProvider()->GetContactsImageHashes($oAccount);
if (\is_array($mResult) && 0 < \count($mResult))
{
$aResult = $mResult;
}
}
return $this->DefaultResponse(__FUNCTION__, $aResult);
// $oAccount = $this->getAccountFromToken();
return $this->DefaultResponse(__FUNCTION__, array());
}
/**
@ -5686,7 +5542,7 @@ class Actions
if ($oAttachment)
{
$sContentLocation = $oAttachment->ContentLocation();
if ($sContentLocation && 0 < strlen($sContentLocation))
if ($sContentLocation && 0 < \strlen($sContentLocation))
{
$aContentLocationUrls[] = $oAttachment->ContentLocation();
}
@ -5746,6 +5602,25 @@ class Actions
'Emails' => $mResponse->Emails
));
}
else if ('RainLoop\Providers\PersonalAddressBook\Classes\Contact' === $sClassName)
{
$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array(
/* @var $mResponse \RainLoop\Providers\PersonalAddressBook\Classes\Contact */
'IdContact' => $mResponse->IdContact,
'Display' => \MailSo\Base\Utils::Utf8Clear($mResponse->Display),
'Properties' => $this->responseObject($mResponse->Properties, $sParent, $aParameters)
));
}
else if ('RainLoop\Providers\PersonalAddressBook\Classes\Property' === $sClassName)
{
$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array(
/* @var $mResponse \RainLoop\Providers\PersonalAddressBook\Classes\Property */
'Type' => $mResponse->Type,
'TypeCustom' => $mResponse->TypeCustom,
'Value' => \MailSo\Base\Utils::Utf8Clear($mResponse->Value),
'ValueClear' => \MailSo\Base\Utils::Utf8Clear($mResponse->ValueClear)
));
}
else if ('MailSo\Mail\Attachment' === $sClassName)
{
$oAccount = $this->getAccountFromToken(false);

430
rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php Normal file
View file

@ -0,0 +1,430 @@
<?php
namespace RainLoop\Common;
abstract class PdoAbstract
{
/**
* @var \PDO
*/
protected $oPDO = null;
/**
* @var \MailSo\Log\Logger
*/
protected $oLogger;
/**
* @var string
*/
protected $sDbType;
/**
* @return bool
*/
public function IsSupported()
{
return !!\class_exists('PDO');
}
/**
* @param \MailSo\Log\Logger $oLogger
*/
public function SetLogger($oLogger)
{
$this->oLogger = $oLogger instanceof \MailSo\Log\Logger ? $oLogger : null;
}
/**
* @return array
*/
protected function getPdoAccessData()
{
return array('', '', '', '');
}
/**
* @return \PDO
*
* @throws \Exception
*/
protected function getPDO()
{
if ($this->oPDO)
{
return $this->oPDO;
}
if (!\class_exists('PDO'))
{
throw new \Exception('Class PDO does not exist');
}
$sType = $sDsn = $sDbLogin = $sDbPassword = '';
list($sType, $sDsn, $sDbLogin, $sDbPassword) = $this->getPdoAccessData();
$this->sDbType = $sType;
$oPdo = false;
try
{
$oPdo = new \PDO($sDsn, $sDbLogin, $sDbPassword);
if ($oPdo)
{
$oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
if ('mysql' === $oPdo->getAttribute(\PDO::ATTR_DRIVER_NAME))
{
$oPdo->exec('SET NAMES utf8 COLLATE utf8_general_ci');
// $oPdo->exec('SET NAMES utf8');
}
}
}
catch (\Exception $oException)
{
throw $oException;
}
if ($oPdo)
{
$this->oPDO = $oPdo;
}
else
{
throw new \Exception('PDO = false');
}
return $oPdo;
}
/**
* @param string $sName = null
*
* @return string
*/
protected function lastInsertId($sName = null)
{
return $this->getPDO()->lastInsertId($sName);
}
/**
* @return nool
*/
protected function beginTransaction()
{
return $this->getPDO()->beginTransaction();
}
/**
* @return nool
*/
protected function commit()
{
return $this->getPDO()->commit();
}
/**
* @return nool
*/
protected function rollBack()
{
return $this->getPDO()->rollBack();
}
/**
* @param \RainLoop\Account $oAccount
* @param string $sSql
* @param array $aParams
* @param bool $bMultParams = false
*
* @return \PDOStatement|null
*/
protected function prepareAndExecute($sSql, $aParams = array(), $bMultParams = false)
{
$mResult = null;
$this->writeLog($sSql);
$oStmt = $this->getPDO()->prepare($sSql);
if ($oStmt)
{
$aRootParams = $bMultParams ? $aParams : array($aParams);
foreach ($aRootParams as $aSubParams)
{
foreach ($aSubParams as $sName => $aValue)
{
$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
}
$mResult = $oStmt->execute() && !$bMultParams ? $oStmt : null;
}
}
return $mResult;
}
/**
* @param string $sSql
*/
protected function writeLog($sSql)
{
if ($this->oLogger)
{
$this->oLogger->Write($sSql, \MailSo\Log\Enumerations\Type::INFO, 'SQL');
}
}
/**
* @param string $sEmail
* @param bool $bSkipInsert = false
*
* @return int
*/
protected function getUserId($sEmail, $bSkipInsert = false)
{
$sEmail = \strtolower(\trim($sEmail));
if (empty($sEmail))
{
throw new \InvalidArgumentException('Empty Email argument');
}
$oStmt = $this->prepareAndExecute('SELECT id_user FROM rainloop_users WHERE rl_email = :rl_email',
array(':rl_email' => array($sEmail, \PDO::PARAM_STR)));
$mRow = $oStmt->fetch(\PDO::FETCH_ASSOC);
if ($mRow && isset($mRow['id_user']) && \is_numeric($mRow['id_user']))
{
return (int) $mRow['id_user'];
}
if (!$bSkipInsert)
{
$oStmt->closeCursor();
$oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email) VALUES (:rl_email)',
array(':rl_email' => array($sEmail, \PDO::PARAM_STR)));
return $this->getUserId($sEmail, true);
}
throw new \Exception('id_user = 0');
}
/**
* @param string $sValue
*
* @return string
*/
protected function quoteValue($sValue)
{
$oPdo = $this->getPDO();
return $oPdo ? $oPdo->quote((string) $sValue, \PDO::PARAM_STR) : '\'\'';
}
/**
* @param string $sType
* @param bool $bReturnIntValue = true
*
* @return int|string|bool
*/
protected function getSystemValue($sName, $bReturnIntValue = true)
{
$oPdo = $this->getPDO();
if ($oPdo)
{
$sQuery = 'SELECT * FROM rainloop_system WHERE sys_name = ?';
$this->writeLog($sQuery);
$oStmt = $oPdo->prepare($sQuery);
if ($oStmt->execute(array($sName)))
{
$mRow = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
if ($mRow && isset($mRow[0]['sys_name'], $mRow[0]['value_int'], $mRow[0]['value_str']))
{
return $bReturnIntValue ? (int) $mRow[0]['value_int'] : (string) $mRow[0]['value_str'];
}
}
}
return false;
}
/**
* @param string $sType
* @param bool $bReturnIntValue = true
*
* @return int|string|bool
*/
protected function getVersion($sName)
{
return $this->getSystemValue($sName.'_version', true);
}
/**
* @param string $sType
* @param int $iVersion
*
* @return bool
*/
protected function setVersion($sName, $iVersion)
{
$bResult = false;
$oPdo = $this->getPDO();
if ($oPdo)
{
$oPdo->beginTransaction();
$sQuery = 'DELETE FROM rainloop_system WHERE sys_name = ? AND value_int <= ?;';
$this->writeLog($sQuery);
$oStmt = $oPdo->prepare($sQuery);
$bResult = !!$oStmt->execute(array($sName.'_version', $iVersion));
if ($bResult)
{
$sQuery = 'INSERT INTO rainloop_system (sys_name, value_int) VALUES (?, ?);';
$this->writeLog($sQuery);
$oStmt = $oPdo->prepare($sQuery);
if ($oStmt)
{
$bResult = !!$oStmt->execute(array($sName.'_version', $iVersion));
}
}
if ($bResult)
{
$oPdo->commit();
}
else
{
$oPdo->rollBack();
}
}
return $bResult;
}
/**
* @throws \Exception
*/
protected function initSystemTables()
{
$bResult = true;
$oPdo = $this->getPDO();
if ($oPdo)
{
$aQ = array();
if ('mysql' === $this->sDbType)
{
$aQ[] = 'CREATE TABLE IF NOT EXISTS `rainloop_system` (
`sys_name` varchar(50) NOT NULL,
`value_int` int(11) UNSIGNED NOT NULL DEFAULT \'0\',
`value_str` varchar(255) NOT NULL DEFAULT \'\'
) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;';
$aQ[] = 'CREATE TABLE IF NOT EXISTS `rainloop_users` (
`id_user` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`rl_email` varchar(255) NOT NULL,
UNIQUE `email_unique` (`rl_email`),
PRIMARY KEY(`id_user`)
) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ ;';
}
if (0 < \count($aQ))
{
try
{
$oPdo->beginTransaction();
foreach ($aQ as $sQuery)
{
if ($bResult)
{
$this->writeLog($sQuery);
$bResult = false !== $oPdo->exec($sQuery);
}
}
if ($bResult)
{
$oPdo->rollBack();
}
else
{
$oPdo->commit();
}
}
catch (\Exception $oException)
{
$oPdo->rollBack();
$this->oLogger->WriteException($oException);
throw $oException;
}
}
}
return $bResult;
}
/**
* @param string $sName
* @param array $aData = array()
*
* @return bool
*/
protected function dataBaseUpgrade($sName, $aData = array())
{
$this->initSystemTables();
$iFromVersion = $this->getVersion($sName);
$bResult = false;
$oPdo = $this->getPDO();
if ($oPdo)
{
$bResult = true;
foreach ($aData as $iVersion => $aQuery)
{
if ($iFromVersion < $iVersion)
{
try
{
$oPdo->beginTransaction();
foreach ($aQuery as $sQuery)
{
$this->writeLog($sQuery);
if (false === $oPdo->exec($sQuery))
{
$bResult = false;
break;
}
}
if ($bResult)
{
$oPdo->commit();
}
else
{
$oPdo->rollBack();
}
}
catch (\Exception $oException)
{
$oPdo->rollBack();
throw $oException;
}
if (!$bResult)
{
break;
}
$this->setVersion($sName, $iVersion);
}
}
}
return $bResult;
}
}

1
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -212,7 +212,6 @@ Enables caching in the system'),
'in_iframe' => array(false),
'custom_login_link' => array(''),
'custom_logout_link' => array(''),
'allow_contacts' => array(true),
'allow_external_login' => array(false),
'allow_admin_panel' => array(true),
'fast_cache_memcache_host' => array('127.0.0.1'),

41
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AbstractProvider.php
View file

@ -1,14 +1,27 @@
<?php
namespace RainLoop\Providers;
abstract class AbstractProvider
{
/**
* @return bool
*/
public function IsActive()
{
return false;
}
}
<?php
namespace RainLoop\Providers;
abstract class AbstractProvider
{
/**
* @var \RainLoop\Account
*/
protected $oAccount;
/**
* @return bool
*/
public function IsActive()
{
return false;
}
/**
* @param \RainLoop\Account $oAccount
*/
public function SetAccount($oAccount)
{
$this->oAccount = $oAccount;
}
}

115
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook.php Normal file
View file

@ -0,0 +1,115 @@
<?php
namespace RainLoop\Providers;
class PersonalAddressBook extends \RainLoop\Providers\AbstractProvider
{
/**
* @var \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface
*/
private $oDriver;
/**
* @param \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface $oDriver
*
* @return void
*/
public function __construct($oDriver)
{
$this->oDriver = null;
if ($oDriver instanceof \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface)
{
$this->oDriver = $oDriver;
}
}
/**
* @return string
*/
public function Version()
{
return $this->oDriver instanceof \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface ?
$this->oDriver->Version() : 'null';
}
/**
* @return bool
*/
public function IsActive()
{
return $this->oDriver instanceof \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface &&
$this->oDriver->IsSupported();
}
/**
* @param \RainLoop\Account $oAccount
* @param \RainLoop\Providers\PersonalAddressBook\Classes\Contact $oContact
*
* @return bool
*/
public function ContactSave($oAccount, &$oContact)
{
return $this->IsActive() ? $this->oDriver->ContactSave($oAccount, $oContact) : false;
}
/**
* @param \RainLoop\Account $oAccount
* @param array $aContactIds
*
* @return bool
*/
public function DeleteContacts($oAccount, $aContactIds)
{
return $this->IsActive() ? $this->oDriver->DeleteContacts($oAccount, $aContactIds) : false;
}
/**
* @param \RainLoop\Account $oAccount
* @param int $iOffset = 0
* @param type $iLimit = 20
* @param string $sSearch = ''
* @param bool $bAutoOnly = false
*
* @return array
*/
public function GetContacts($oAccount,
$iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false)
{
return $this->IsActive() ? $this->oDriver->GetContacts($oAccount,
$iOffset, $iLimit, $sSearch, $bAutoOnly) : array();
}
/**
* @param \RainLoop\Account $oAccount
* @param string $sSearch
* @param int $iLimit = 20
*
* @return array
*
* @throws \InvalidArgumentException
*/
public function GetSuggestions($oAccount, $sSearch, $iLimit = 20)
{
return $this->IsActive() ? $this->oDriver->GetSuggestions($oAccount, $sSearch, $iLimit) : array();
}
/**
* @param \RainLoop\Account $oAccount
* @param array $aEmails
*
* @return bool
*/
public function IncFrec($oAccount, $aEmails)
{
return $this->IsActive() ? $this->oDriver->IncFrec($oAccount, $aEmails) : false;
}
/**
* @return bool
*/
public function SynchronizeStorage()
{
return $this->IsActive() && \method_exists($this->oDriver, 'SynchronizeStorage') &&
$this->oDriver->SynchronizeStorage();
}
}

111
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Classes/Contact.php Normal file
View file

@ -0,0 +1,111 @@
<?php
namespace RainLoop\Providers\PersonalAddressBook\Classes;
class Contact
{
/**
* @var string
*/
public $IdContact;
/**
* @var string
*/
public $Display;
/**
* @var string
*/
public $DisplayName;
/**
* @var string
*/
public $DisplayEmail;
/**
* @var bool
*/
public $Auto;
/**
* @var int
*/
public $Changed;
/**
* @var array
*/
public $Tags;
/**
* @var array
*/
public $Properties;
public function __construct()
{
$this->Clear();
}
public function Clear()
{
$this->IdContact = '';
$this->IdUser = 0;
$this->Display = '';
$this->DisplayName = '';
$this->DisplayEmail = '';
$this->Auto = false;
$this->Changed = \time();
$this->Tags = array();
$this->Properties = array();
}
public function UpdateDependentValues()
{
$sDisplayName = '';
$sDisplayEmail = '';
foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\PersonalAddressBook\Classes\Property */ &$oProperty)
{
if ($oProperty)
{
$oProperty->UpdateDependentValues();
if ('' === $sDisplayName && \RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType::FULLNAME === $oProperty->Type &&
0 < \strlen($oProperty->Value))
{
$sDisplayName = $oProperty->Value;
}
else if ('' === $sDisplayEmail && $oProperty->IsEmail() &&
0 < \strlen($oProperty->Value))
{
$sDisplayEmail = $oProperty->Value;
}
}
}
$this->DisplayName = $sDisplayName;
$this->DisplayEmail = $sDisplayEmail;
$this->Display = 0 < \strlen($sDisplayName) ? $sDisplayName : (!empty($sDisplayEmail) ? $sDisplayEmail : '');
}
/**
* @return array
*/
public function GetEmails()
{
$aResult = array();
foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\PersonalAddressBook\Classes\Property */ &$oProperty)
{
if ($oProperty && $oProperty->IsEmail())
{
$aResult[] = $oProperty->Value;
}
}
return \array_unique($aResult);
}
}

97
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Classes/Property.php Normal file
View file

@ -0,0 +1,97 @@
<?php
namespace RainLoop\Providers\PersonalAddressBook\Classes;
use RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType;
class Property
{
/**
* @var int
*/
public $Type;
/**
* @var string
*/
public $TypeCustom;
/**
* @var string
*/
public $Value;
/**
* @var string
*/
public $ValueClear;
/**
* @var int
*/
public $Frec;
public function __construct()
{
$this->Clear();
}
public function Clear()
{
$this->Type = PropertyType::UNKNOWN;
$this->TypeCustom = '';
$this->Value = '';
$this->ValueClear = '';
$this->Frec = 0;
}
/**
* @return bool
*/
public function IsEmail()
{
return \in_array($this->Type, array(
PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER
));
}
/**
* @return bool
*/
public function IsPhone()
{
return \in_array($this->Type, array(
PropertyType::PHONE_PERSONAL, PropertyType::PHONE_BUSSINES, PropertyType::PHONE_OTHER,
PropertyType::MOBILE_PERSONAL, PropertyType::MOBILE_BUSSINES, PropertyType::MOBILE_OTHER,
PropertyType::FAX_BUSSINES, PropertyType::FAX_OTHER
));
}
public function UpdateDependentValues()
{
// trimer
$this->Value = \trim($this->Value);
$this->ValueClear = \trim($this->ValueClear);
$this->TypeCustom = \trim($this->TypeCustom);
if (0 < \strlen($this->Value))
{
// lower
if ($this->IsEmail())
{
$this->Value = \strtolower($this->Value);
}
// phones clear value for searching
if ($this->IsPhone())
{
$sPhone = $this->Value;
$sPhone = \preg_replace('/^[+]+/', '', $sPhone);
$sPhone = \preg_replace('/[^\d]/', '', $sPhone);
$this->ValueClear = $sPhone;
}
}
}
}

39
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Enumerations/PropertyType.php Normal file
View file

@ -0,0 +1,39 @@
<?php
namespace RainLoop\Providers\PersonalAddressBook\Enumerations;
class PropertyType
{
const UNKNOWN = 0;
const FULLNAME = 10;
const FIRST_NAME = 15;
const SUR_NAME = 16;
const MIDDLE_NAME = 17;
const NICK = 18;
const EMAIl_PERSONAL = 30;
const EMAIl_BUSSINES = 31;
const EMAIl_OTHER = 32;
const PHONE_PERSONAL = 50;
const PHONE_BUSSINES = 51;
const PHONE_OTHER = 52;
const MOBILE_PERSONAL = 60;
const MOBILE_BUSSINES = 61;
const MOBILE_OTHER = 62;
const FAX_PERSONAL = 70;
const FAX_BUSSINES = 71;
const FAX_OTHER = 72;
const FACEBOOK = 90;
const SKYPE = 91;
const GITHUB = 92;
const DESCRIPTION = 110;
const CUSTOM = 250;
}

63
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/PersonalAddressBookInterface.php Normal file
View file

@ -0,0 +1,63 @@
<?php
namespace RainLoop\Providers\PersonalAddressBook;
interface PersonalAddressBookInterface
{
/**
* @return string
*/
public function Version();
/**
* @return bool
*/
public function IsSupported();
/**
* @param \RainLoop\Account $oAccount
* @param \RainLoop\Providers\PersonalAddressBook\Classes\Contact $oContact
*
* @return bool
*/
public function ContactSave($oAccount, &$oContact);
/**
* @param \RainLoop\Account $oAccount
* @param array $aContactIds
*
* @return bool
*/
public function DeleteContacts($oAccount, $aContactIds);
/**
* @param \RainLoop\Account $oAccount
* @param int $iOffset = 0
* @param type $iLimit = 20
* @param string $sSearch = ''
* @param bool $bAutoOnly = false
*
* @return array
*/
public function GetContacts($oAccount,
$iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false);
/**
* @param \RainLoop\Account $oAccount
* @param string $sSearch
* @param int $iLimit = 20
*
* @return array
*
* @throws \InvalidArgumentException
*/
public function GetSuggestions($oAccount, $sSearch, $iLimit = 20);
/**
* @param \RainLoop\Account $oAccount
* @param array $aEmails
*
* @return bool
*/
public function IncFrec($oAccount, $aEmails);
}

9
rainloop/v/0.0.0/app/templates/Views/AdminSettingsGeneral.html
View file

@ -9,15 +9,6 @@
password to something else now.
</div>
</div>
<div class="row" data-bind="visible: !contactsSupported">
<div class="alert span8">
<h4>Notice!</h4>
<br />
<strong>Contacts</strong> functions are not supported.
<br />
You need to install or enable <strong>PDO (sqlite)</strong> exstenstion on your server.
</div>
</div>
<div class="form-horizontal">
<div class="legend">
General

225
rainloop/v/0.0.0/app/templates/Views/PopupsContacts.html
View file

@ -1,104 +1,121 @@
<div class="popups">
<div class="modal hide b-contacts-content" data-bind="modal: modalVisibility">
<div class="modal-header b-header-toolbar g-ui-user-select-none">
<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
<a class="btn button-create-contact" data-bind="command: newCommand">
<i class="icon-plus"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n-text="CONTACTS/BUTTON_ADD_CONTACT"></span>
</a>
<a class="btn btn-success button-new-message" data-bind="command: newMessageCommand">
<i class="icon-envelope icon-white"></i>
</a>
<a class="btn btn-danger button-delete" data-bind="command: deleteCommand">
<i class="icon-trash icon-white"></i>
<span data-bind="text: 1 < contactsCheckedOrSelected().length ? ' (' + contactsCheckedOrSelected().length + ')' : ''"></span>
</a>
</div>
<div class="modal-body" style="position: relative">
<div class="b-list-toopbar">
<input class="i18n span3 e-search" type="text" placeholder="Search" data-18n-placeholder="CONTACS/SEARCH_INPUT_PLACEHOLDER" data-bind="value: search" />
</div>
<div class="b-list-content g-ui-user-select-none" data-bind="nano: true, css: {'hideContactListCheckbox': !useCheckboxesInList()}">
<div class="content g-scrollbox">
<div class="content-wrapper">
<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
<span class="g-ui-link i18n" data-i18n-text="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
</div>
<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()">
<span class="i18n" data-i18n-text="CONTACTS/EMPTY_LIST"></span>
</div>
<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
<span class="i18n" data-i18n-text="CONTACTS/LIST_LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
</div>
<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()">
<span class="i18n" data-i18n-text="CONTACTS/EMPTY_SEARCH"></span>
</div>
<div class="e-contact-foreach" data-bind="foreach: contacts, visible: 0 < contacts().length">
<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCcc()">
<div class="sidebarParent">
&nbsp;
</div>
<div class="delimiter"></div>
<div class="wrapper">
<div class="checkedParent">
<i class="checkboxItem" data-bind="css: checked() || selected() ? 'checkboxMessage icon-checkbox-checked' : 'checkboxMessage icon-checkbox-unchecked'"></i>
</div>
<div class="nameParent actionHandle">
<span class="listName" data-bind="text: listName"></span>
&nbsp;
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="b-view-content" data-bind="nano: true">
<div class="content g-scrollbox">
<div class="content-wrapper">
<div class="b-contact-view-desc" data-bind="visible: emptySelection">
<span class="i18n" data-i18n-text="CONTACTS/CONTACT_VIEW_DESC"></span>
</div>
<div data-bind="visible: !emptySelection()">
<div class="form-horizontal top-part">
<div class="control-group">
<div class="control-label" data-bind="initDom: imageUploader">
<div class="image-wrapper" style="width: 100px; height: 100px;">
<img data-bind="initDom: imageDom" style="width: 100px; height: 100px;" />
</div>
</div>
<div class="controls">
<div class="top-row">
<span class="contactEmptyValueClick" data-bind="visible: !viewName.focused() && '' === viewName(), click: function() { viewName.focused(true); }">display name</span>
<span class="contactValueClick" data-bind="visible: !viewName.focused() && '' !== viewName(), click: function() { viewName.focused(true); }, text: viewName"></span>
<input class="contactValueInput span5" type="text" placeholder="display name" data-bind="value: viewName, visible: viewName.focused, hasfocus: viewName.focused, onEnter: function () { viewName.focused(false); }">
</div>
<div class="top-row" data-bind="css: { hasError: viewEmail.hasError() }">
<span class="contactEmptyValueClick" data-bind="visible: !viewEmail.focused() && '' === viewEmail(), click: function() { viewEmail.focused(true); }">email</span>
<span class="contactValueClick" data-bind="visible: !viewEmail.focused() && !viewEmail.hasError() && '' !== viewEmail(), click: function() { viewEmail.focused(true); }, text: viewEmail"></span>
<input class="contactValueInput span5" type="text" placeholder="email" data-bind="value: viewEmail, visible: viewEmail.hasError() || viewEmail.focused(), hasfocus: viewEmail.focused, onEnter: function () { viewEmail.focused(false); }">
</div>
</div>
</div>
<div class="control-group">
<div class="control-label">
</div>
<div class="controls">
</div>
</div>
</div>
<button class="btn button-save-contact" data-bind="command: saveCommand">
<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner-2 animated': viewSaving()}"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n-text="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
<span class="i18n" data-i18n-text="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="popups">
<div class="modal hide b-contacts-content" data-bind="modal: modalVisibility">
<div class="modal-header b-header-toolbar g-ui-user-select-none">
<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
<a class="btn button-create-contact" data-bind="command: newCommand">
<i class="icon-plus"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n-text="CONTACTS/BUTTON_ADD_CONTACT"></span>
</a>
<a class="btn btn-success button-new-message" data-bind="command: newMessageCommand">
<i class="icon-envelope icon-white"></i>
</a>
<a class="btn btn-danger button-delete" data-bind="command: deleteCommand">
<i class="icon-trash icon-white"></i>
<span data-bind="text: 1 < contactsCheckedOrSelected().length ? ' (' + contactsCheckedOrSelected().length + ')' : ''"></span>
</a>
</div>
<div class="modal-body" style="position: relative">
<div class="b-list-toopbar">
<input class="i18n span3 e-search" type="text" placeholder="Search" data-18n-placeholder="CONTACS/SEARCH_INPUT_PLACEHOLDER" data-bind="value: search" />
</div>
<div class="b-list-content g-ui-user-select-none" data-bind="nano: true, css: {'hideContactListCheckbox': !useCheckboxesInList()}">
<div class="content g-scrollbox">
<div class="content-wrapper">
<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
<span class="g-ui-link i18n" data-i18n-text="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
</div>
<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()">
<span class="i18n" data-i18n-text="CONTACTS/EMPTY_LIST"></span>
</div>
<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
<span class="i18n" data-i18n-text="CONTACTS/LIST_LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
</div>
<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()">
<span class="i18n" data-i18n-text="CONTACTS/EMPTY_SEARCH"></span>
</div>
<div class="e-contact-foreach" data-bind="foreach: contacts, visible: 0 < contacts().length">
<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCcc()">
<div class="sidebarParent">
&nbsp;
</div>
<div class="delimiter"></div>
<div class="wrapper">
<div class="checkedParent">
<i class="checkboxItem" data-bind="css: checked() || selected() ? 'checkboxMessage icon-checkbox-checked' : 'checkboxMessage icon-checkbox-unchecked'"></i>
</div>
<div class="nameParent actionHandle">
<span class="listName" data-bind="text: display"></span>
&nbsp;
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="b-view-content" data-bind="nano: true">
<div class="content g-scrollbox">
<div class="content-wrapper">
<div class="b-contact-view-desc" data-bind="visible: emptySelection">
<span class="i18n" data-i18n-text="CONTACTS/CONTACT_VIEW_DESC"></span>
</div>
<div data-bind="visible: !emptySelection()">
<div class="form-horizontal top-part">
<div class="control-group">
<label class="control-label">
<span class="i18n">Display name</span>
</label>
<div class="controls" data-bind="foreach: viewPropertiesNames">
<div class="property-line">
<input type="text" class="contactValueInput" data-bind="value: value, valueUpdate: 'keyup'" />
</div>
</div>
</div>
<div class="control-group">
<label class="control-label">
<span class="i18n">Emails</span>
</label>
<div class="controls">
<div data-bind="foreach: viewPropertiesEmails">
<div class="property-line">
<input type="email" class="contactValueInput" data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
</div>
</div>
<div class="g-ui-link add-link" data-bind="click: addNewEmail">Add an email address</div>
</div>
</div>
<div class="control-group">
<label class="control-label">
<span class="i18n">Phones</span>
</label>
<div class="controls">
<div data-bind="foreach: viewPropertiesPhones">
<div class="property-line">
<input type="email" class="contactValueInput" data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
</div>
</div>
<div class="g-ui-link add-link" data-bind="click: addNewPhone">Add a phone</div>
</div>
</div>
<div class="control-group">
<div class="controls">
<br />
<br />
</div>
</div>
</div>
<button class="btn button-save-contact" data-bind="command: saveCommand">
<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner-2 animated': viewSaving()}"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n-text="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
<span class="i18n" data-i18n-text="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

47
rainloop/v/0.0.0/static/css/app.css
View file

@ -7250,58 +7250,27 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
color: #999;
}
.b-contacts-content.modal .b-view-content .top-part {
margin-top: 20px;
padding-top: 20px;
}
.b-contacts-content.modal .b-view-content .top-part .control-label {
text-align: center;
}
.b-contacts-content.modal .b-view-content .image-wrapper {
margin-left: 30px;
border-radius: 10px;
}
.b-contacts-content.modal .b-view-content .image-wrapper img {
border-radius: 10px;
.b-contacts-content.modal .b-view-content .property-line {
margin-bottom: 5px;
}
.b-contacts-content.modal .b-view-content .top-row {
padding: 10px 0;
height: 30px;
}
.b-contacts-content.modal .b-view-content .contactEmptyValueClick,
.b-contacts-content.modal .b-view-content .contactValueClick,
.b-contacts-content.modal .b-view-content .contactValueInput {
display: inline-block;
font-size: 24px;
line-height: 28px;
height: 28px;
.b-contacts-content.modal .b-view-content .add-link {
padding-top: 5px;
font-size: 12px;
color: #aaa;
}
.b-contacts-content.modal .b-view-content .contactEmptyValueClick,
.b-contacts-content.modal .b-view-content .contactValueClick {
color: #ddd;
cursor: pointer;
margin: 5px 0 0 7px;
}
.b-contacts-content.modal .b-view-content .contactValueInput {
padding-left: 6px;
}
.b-contacts-content.modal .b-view-content .contactEmptyValueClick {
border-bottom: 1px dashed #ddd;
}
.b-contacts-content.modal .b-view-content .contactValueClick {
color: #555;
border-bottom: 11px dashed transparent;
}
.b-contacts-content.modal .b-view-content .contactValueClick:hover {
color: #000;
border-bottom: 1px dashed #000;
}
.b-contacts-content.modal .b-view-content .hasError .contactValueClick,
.b-contacts-content.modal .b-view-content .hasError .contactValueInput {
color: #ee5f5b;
border: 1px solid #ee5f5b;
}
.b-contacts-content.modal .b-view-content .button-save-contact {
position: absolute;
bottom: 20px;
top: 20px;
right: 20px;
}
.b-contacts-content .e-contact-item {

2
rainloop/v/0.0.0/static/css/app.min.css vendored
View file

File diff suppressed because one or more lines are too long

47
rainloop/v/0.0.0/static/css/less.css
View file

@ -5095,58 +5095,27 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
color: #999;
}
.b-contacts-content.modal .b-view-content .top-part {
margin-top: 20px;
padding-top: 20px;
}
.b-contacts-content.modal .b-view-content .top-part .control-label {
text-align: center;
}
.b-contacts-content.modal .b-view-content .image-wrapper {
margin-left: 30px;
border-radius: 10px;
}
.b-contacts-content.modal .b-view-content .image-wrapper img {
border-radius: 10px;
.b-contacts-content.modal .b-view-content .property-line {
margin-bottom: 5px;
}
.b-contacts-content.modal .b-view-content .top-row {
padding: 10px 0;
height: 30px;
}
.b-contacts-content.modal .b-view-content .contactEmptyValueClick,
.b-contacts-content.modal .b-view-content .contactValueClick,
.b-contacts-content.modal .b-view-content .contactValueInput {
display: inline-block;
font-size: 24px;
line-height: 28px;
height: 28px;
.b-contacts-content.modal .b-view-content .add-link {
padding-top: 5px;
font-size: 12px;
color: #aaa;
}
.b-contacts-content.modal .b-view-content .contactEmptyValueClick,
.b-contacts-content.modal .b-view-content .contactValueClick {
color: #ddd;
cursor: pointer;
margin: 5px 0 0 7px;
}
.b-contacts-content.modal .b-view-content .contactValueInput {
padding-left: 6px;
}
.b-contacts-content.modal .b-view-content .contactEmptyValueClick {
border-bottom: 1px dashed #ddd;
}
.b-contacts-content.modal .b-view-content .contactValueClick {
color: #555;
border-bottom: 11px dashed transparent;
}
.b-contacts-content.modal .b-view-content .contactValueClick:hover {
color: #000;
border-bottom: 1px dashed #000;
}
.b-contacts-content.modal .b-view-content .hasError .contactValueClick,
.b-contacts-content.modal .b-view-content .hasError .contactValueInput {
color: #ee5f5b;
border: 1px solid #ee5f5b;
}
.b-contacts-content.modal .b-view-content .button-save-contact {
position: absolute;
bottom: 20px;
top: 20px;
right: 20px;
}
.b-contacts-content .e-contact-item {

49
rainloop/v/0.0.0/static/js/admin.js
View file

@ -487,6 +487,45 @@ Enums.InterfaceAnimation = {
'Full': 'Full'
};
/**
* @enum {number}
*/
Enums.ContactPropertyType = {
'Unknown': 0,
'FullName': 10,
'FirstName': 15,
'SurName': 16,
'MiddleName': 17,
'Nick': 18,
'EmailPersonal': 30,
'EmailBussines': 31,
'EmailOther': 32,
'PhonePersonal': 50,
'PhoneBussines': 51,
'PhoneOther': 52,
'MobilePersonal': 60,
'MobileBussines': 61,
'MobileOther': 62,
'FaxPesonal': 70,
'FaxBussines': 71,
'FaxOther': 72,
'Facebook': 90,
'Skype': 91,
'GitHub': 92,
'Description': 110,
'Custom': 250
};
/**
* @enum {number}
*/
@ -1427,7 +1466,6 @@ Utils.initDataConstructorBySettings = function (oData)
oData.dropboxEnable = ko.observable(false);
oData.dropboxApiKey = ko.observable('');
oData.contactsIsSupported = ko.observable(false);
oData.contactsIsAllowed = ko.observable(false);
};
@ -2679,6 +2717,12 @@ ko.extenders.falseTimeout = function (oTarget, iOption)
return oTarget;
};
ko.observable.fn.validateNone = function ()
{
this.hasError = ko.observable(false);
return this;
};
ko.observable.fn.validateEmail = function ()
{
this.hasError = ko.observable(false);
@ -4866,8 +4910,6 @@ function AdminGeneral()
return Utils.convertLangName(this.mainLanguage());
}, this);
this.contactsSupported = RL.settingsGet('ContactsIsSupported');
this.contactsIsAllowed = RL.settingsGet('ContactsIsAllowed');
this.weakPassword = !!RL.settingsGet('WeakPassword');
this.titleTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -5588,7 +5630,6 @@ AbstractData.prototype.populateDataOnStart = function()
this.dropboxEnable(!!RL.settingsGet('AllowDropboxSocial'));
this.dropboxApiKey(RL.settingsGet('DropboxApiKey'));
this.contactsIsSupported(!!RL.settingsGet('ContactsIsSupported'));
this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
};

6
rainloop/v/0.0.0/static/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

380
rainloop/v/0.0.0/static/js/app.js
View file

@ -487,6 +487,45 @@ Enums.InterfaceAnimation = {
'Full': 'Full'
};
/**
* @enum {number}
*/
Enums.ContactPropertyType = {
'Unknown': 0,
'FullName': 10,
'FirstName': 15,
'SurName': 16,
'MiddleName': 17,
'Nick': 18,
'EmailPersonal': 30,
'EmailBussines': 31,
'EmailOther': 32,
'PhonePersonal': 50,
'PhoneBussines': 51,
'PhoneOther': 52,
'MobilePersonal': 60,
'MobileBussines': 61,
'MobileOther': 62,
'FaxPesonal': 70,
'FaxBussines': 71,
'FaxOther': 72,
'Facebook': 90,
'Skype': 91,
'GitHub': 92,
'Description': 110,
'Custom': 250
};
/**
* @enum {number}
*/
@ -1427,7 +1466,6 @@ Utils.initDataConstructorBySettings = function (oData)
oData.dropboxEnable = ko.observable(false);
oData.dropboxApiKey = ko.observable('');
oData.contactsIsSupported = ko.observable(false);
oData.contactsIsAllowed = ko.observable(false);
};
@ -2679,6 +2717,12 @@ ko.extenders.falseTimeout = function (oTarget, iOption)
return oTarget;
};
ko.observable.fn.validateNone = function ()
{
this.hasError = ko.observable(false);
return this;
};
ko.observable.fn.validateEmail = function ()
{
this.hasError = ko.observable(false);
@ -5652,26 +5696,65 @@ EmailModel.prototype.inputoTagLine = function ()
function ContactModel()
{
this.idContact = 0;
this.imageHash = '';
this.listName = '';
this.name = '';
this.emails = [];
this.display = '';
this.properties = [];
this.checked = ko.observable(false);
this.selected = ko.observable(false);
this.deleted = ko.observable(false);
}
/**
* @return {Array|null}
*/
ContactModel.prototype.getNameAndEmailHelper = function ()
{
var
sName = '',
sEmail = ''
;
if (Utils.isNonEmptyArray(this.properties))
{
_.each(this.properties, function (aProperty) {
if (aProperty)
{
if ('' === sName && Enums.ContactPropertyType.FullName === aProperty[0])
{
sName = aProperty[1];
}
else if ('' === sEmail && -1 < Utils.inArray(aProperty[0], [
Enums.ContactPropertyType.EmailPersonal,
Enums.ContactPropertyType.EmailBussines,
Enums.ContactPropertyType.EmailOther
]))
{
sEmail = aProperty[1];
}
}
}, this);
}
return '' === sEmail ? null : [sEmail, sName];
};
ContactModel.prototype.parse = function (oItem)
{
var bResult = false;
if (oItem && 'Object/Contact' === oItem['@Object'])
{
this.idContact = Utils.pInt(oItem['IdContact']);
this.listName = Utils.pString(oItem['ListName']);
this.name = Utils.pString(oItem['Name']);
this.emails = Utils.isNonEmptyArray(oItem['Emails']) ? oItem['Emails'] : [];
this.imageHash = Utils.pString(oItem['ImageHash']);
this.display = Utils.pString(oItem['Display']);
if (Utils.isNonEmptyArray(oItem['Properties']))
{
_.each(oItem['Properties'], function (oProperty) {
if (oProperty && oProperty['Type'] && Utils.isNormal(oProperty['Value']))
{
this.properties.push([Utils.pInt(oProperty['Type']), Utils.pString(oProperty['Value'])]);
}
}, this);
}
bResult = true;
}
@ -5684,8 +5767,7 @@ ContactModel.prototype.parse = function (oItem)
*/
ContactModel.prototype.srcAttr = function ()
{
return '' === this.imageHash ? RL.link().emptyContactPic() :
RL.link().getUserPicUrlFromHash(this.imageHash);
return RL.link().emptyContactPic();
};
/**
@ -5718,6 +5800,19 @@ ContactModel.prototype.lineAsCcc = function ()
return aResult.join(' ');
};
/**
* @param {number=} iType = Enums.ContactPropertyType.Unknown
* @param {string=} sValue = ''
*
* @constructor
*/
function ContactPropertyModel(iType, sValue)
{
this.type = ko.observable(Utils.isUnd(iType) ? Enums.ContactPropertyType.Unknown : iType);
this.focused = ko.observable(false);
this.value = ko.observable(Utils.pString(sValue));
}
/**
* @constructor
*/
@ -8060,7 +8155,7 @@ PopupsComposeViewModel.prototype.sendMessageResponse = function (sResult, oData)
else
{
this.sendError(true);
window.alert(Utils.getNotification(oData.ErrorCode ? oData.ErrorCode : Enums.Notification.CantSendMessage));
window.alert(Utils.getNotification(oData && oData.ErrorCode ? oData.ErrorCode : Enums.Notification.CantSendMessage));
}
}
};
@ -8948,12 +9043,22 @@ function PopupsContactsViewModel()
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsContacts');
var self = this;
var
self = this,
aNameTypes = [Enums.ContactPropertyType.FullName, Enums.ContactPropertyType.FirstName, Enums.ContactPropertyType.SurName, Enums.ContactPropertyType.MiddleName],
aEmailTypes = [Enums.ContactPropertyType.EmailPersonal, Enums.ContactPropertyType.EmailBussines, Enums.ContactPropertyType.EmailOther],
aPhonesTypes = [
Enums.ContactPropertyType.PhonePersonal, Enums.ContactPropertyType.PhoneBussines, Enums.ContactPropertyType.PhoneOther,
Enums.ContactPropertyType.MobilePersonal, Enums.ContactPropertyType.MobileBussines, Enums.ContactPropertyType.MobileOther,
Enums.ContactPropertyType.FaxPesonal, Enums.ContactPropertyType.FaxBussines, Enums.ContactPropertyType.FaxOther
],
fFastClearEmptyListHelper = function (aList) {
if (aList && 0 < aList.length) {
self.viewProperties.removeAll(aList);
}
}
;
this.imageUploader = ko.observable(null);
this.imageDom = ko.observable(null);
this.imageTrigger = ko.observable(false);
this.search = ko.observable('');
this.contacts = ko.observableArray([]);
this.contacts.loading = ko.observable(false).extend({'throttle': 200});
@ -8963,11 +9068,50 @@ function PopupsContactsViewModel()
this.viewClearSearch = ko.observable(false);
this.viewID = ko.observable('');
this.viewName = ko.observable('');
this.viewName.focused = ko.observable(false);
this.viewEmail = ko.observable('').validateEmail();
this.viewEmail.focused = ko.observable(false);
this.viewImageUrl = ko.observable(RL.link().emptyContactPic());
this.viewProperties = ko.observableArray([]);
this.viewPropertiesNames = this.viewProperties.filter(function(oProperty) {
return -1 < Utils.inArray(oProperty.type(), aNameTypes);
});
this.viewPropertiesEmails = this.viewProperties.filter(function(oProperty) {
return -1 < Utils.inArray(oProperty.type(), aEmailTypes);
});
this.viewHasNonEmptyRequaredProperties = ko.computed(function() {
var
aNames = this.viewPropertiesNames(),
aEmail = this.viewPropertiesEmails(),
fHelper = function (oProperty) {
return '' !== Utils.trim(oProperty.value());
}
;
return !!(_.find(aNames, fHelper) || _.find(aEmail, fHelper));
}, this);
this.viewPropertiesPhones = this.viewProperties.filter(function(oProperty) {
return -1 < Utils.inArray(oProperty.type(), aPhonesTypes);
});
this.viewPropertiesEmailsEmptyAndOnFocused = this.viewPropertiesEmails.filter(function(oProperty) {
var bF = oProperty.focused();
return '' === Utils.trim(oProperty.value()) && !bF;
});
this.viewPropertiesPhonesEmptyAndOnFocused = this.viewPropertiesPhones.filter(function(oProperty) {
var bF = oProperty.focused();
return '' === Utils.trim(oProperty.value()) && !bF;
});
this.viewPropertiesEmailsEmptyAndOnFocused.subscribe(function(aList) {
fFastClearEmptyListHelper(aList);
});
this.viewPropertiesPhonesEmptyAndOnFocused.subscribe(function(aList) {
fFastClearEmptyListHelper(aList);
});
this.viewSaving = ko.observable(false);
@ -8981,8 +9125,8 @@ function PopupsContactsViewModel()
Utils.windowResize();
}, this);
this.viewImageUrl.subscribe(function (sUrl) {
this.imageDom()['src'] = sUrl;
this.viewProperties.subscribe(function () {
Utils.windowResize();
}, this);
this.contactsChecked = ko.computed(function () {
@ -9043,22 +9187,26 @@ function PopupsContactsViewModel()
if (Utils.isNonEmptyArray(aC))
{
aE = _.map(aC, function (oItem) {
if (oItem && oItem['emails'])
if (oItem)
{
var oEmail = new EmailModel(oItem['emails'][0] || '', oItem['name']);
if (oEmail.validate())
var
aData = oItem.getNameAndEmailHelper(),
oEmail = aData ? new EmailModel(aData[0], aData[1]) : null
;
if (oEmail && oEmail.validate())
{
return oEmail;
}
}
return null;
});
aE = _.compact(aE);
}
if (Utils.isNonEmptyArray(aC))
if (Utils.isNonEmptyArray(aE))
{
kn.hideScreenPopup(PopupsContactsViewModel);
kn.showScreenPopup(PopupsComposeViewModel, [Enums.ComposeType.Empty, null, aE]);
@ -9073,12 +9221,21 @@ function PopupsContactsViewModel()
});
this.saveCommand = Utils.createCommand(this, function () {
var
this.viewSaving(true);
var
sRequestUid = Utils.fakeMd5(),
bImageTrigger = this.imageTrigger()
aProperties = []
;
this.viewSaving(true);
_.each(this.viewProperties(), function (oItem) {
if (oItem.type() && '' !== Utils.trim(oItem.value()))
{
aProperties.push([oItem.type(), oItem.value()]);
}
});
RL.remote().contactSave(function (sResult, oData) {
self.viewSaving(false);
@ -9091,31 +9248,42 @@ function PopupsContactsViewModel()
}
self.reloadContactList();
if (bImageTrigger)
{
RL.emailsPicsHashes();
}
}
// else
// {
// // TODO
// }
}, sRequestUid, this.viewID(), this.viewName(), this.viewEmail(), bImageTrigger ? this.imageDom()['src'] : '');
}, sRequestUid, this.viewID(), aProperties);
}, function () {
var
sViewName = this.viewName(),
sViewEmail = this.viewEmail()
;
return !this.viewSaving() &&
('' !== sViewName || '' !== sViewEmail);
var bV = this.viewHasNonEmptyRequaredProperties();
return !this.viewSaving() && bV;
});
}
Utils.extendAsViewModel('PopupsContactsViewModel', PopupsContactsViewModel);
PopupsContactsViewModel.prototype.addNewEmail = function ()
{
// if (0 === this.viewPropertiesEmailsEmpty().length)
// {
var oItem = new ContactPropertyModel(Enums.ContactPropertyType.EmailPersonal, '');
oItem.focused(true);
this.viewProperties.push(oItem);
// }
};
PopupsContactsViewModel.prototype.addNewPhone = function ()
{
// if (0 === this.viewPropertiesPhonesEmpty().length)
// {
var oItem = new ContactPropertyModel(Enums.ContactPropertyType.PhonePersonal, '');
oItem.focused(true);
this.viewProperties.push(oItem);
// }
};
PopupsContactsViewModel.prototype.removeCheckedOrSelectedContactsFromList = function ()
{
var
@ -9181,28 +9349,51 @@ PopupsContactsViewModel.prototype.deleteResponse = function (sResult, oData)
}
};
PopupsContactsViewModel.prototype.removeProperty = function (oProp)
{
this.viewProperties.remove(oProp);
};
/**
* @param {?ContactModel} oContact
*/
PopupsContactsViewModel.prototype.populateViewContact = function (oContact)
{
this.imageTrigger(false);
var
sId = '',
bHasName = false,
aList = []
;
this.emptySelection(false);
if (oContact)
{
this.viewID(oContact.idContact);
this.viewName(oContact.name);
this.viewEmail(oContact.emails[0] || '');
this.viewImageUrl(oContact.srcAttr());
sId = oContact.idContact;
if (Utils.isNonEmptyArray(oContact.properties))
{
_.each(oContact.properties, function (aProperty) {
if (aProperty && aProperty[0])
{
aList.push(new ContactPropertyModel(aProperty[0], aProperty[1]));
if (Enums.ContactPropertyType.FullName === aProperty[0])
{
bHasName = true;
}
}
});
}
}
else
if (!bHasName)
{
this.viewID('');
this.viewName('');
this.viewEmail('');
this.viewImageUrl(RL.link().emptyContactPic());
aList.push(new ContactPropertyModel(Enums.ContactPropertyType.FullName, ''));
}
this.viewID(sId);
this.viewProperties([]);
this.viewProperties(aList);
};
PopupsContactsViewModel.prototype.reloadContactList = function ()
@ -9233,20 +9424,16 @@ PopupsContactsViewModel.prototype.reloadContactList = function ()
self.contacts.setSelectedByUid('' + self.viewID());
}
}, this.search());
}, 0, 20, this.search());
};
PopupsContactsViewModel.prototype.onBuild = function (oDom)
{
this.initUploader();
this.oContentVisible = $('.b-list-content', oDom);
this.oContentScrollable = $('.content', this.oContentVisible);
this.selector.init(this.oContentVisible, this.oContentScrollable);
this.viewImageUrl.valueHasMutated();
ko.computed(function () {
var
bModalVisibility = this.modalVisibility(),
@ -9256,56 +9443,6 @@ PopupsContactsViewModel.prototype.onBuild = function (oDom)
}, this).extend({'notify': 'always'});
};
PopupsContactsViewModel.prototype.initUploader = function ()
{
var self = this, oJua = null;
if (window.File && window.FileReader && this.imageUploader())
{
oJua = new Jua({
'queueSize': 1,
'multipleSizeLimit': 1,
'clickElement': this.imageUploader(),
'disableDragAndDrop': true,
'disableMultiple': true,
'onSelect': function (sId, oData) {
if (oData && oData['File'] && oData['File']['type'])
{
var
oReader = null,
oFile = oData['File'],
sType = oData['File']['type']
;
if (!sType.match(/image.*/))
{
window.alert('this file is not an image.');
}
else
{
oReader = new window.FileReader();
oReader.onload = function (oEvent) {
if (oEvent && oEvent.target && oEvent.target.result)
{
Utils.resizeAndCrop(oEvent.target.result, 150, function (sUrl) {
self.viewImageUrl(sUrl);
self.imageTrigger(true);
});
}
};
oReader.readAsDataURL(oFile);
}
}
return false;
}
});
}
return oJua;
};
PopupsContactsViewModel.prototype.onShow = function ()
{
kn.routeOff();
@ -10112,7 +10249,7 @@ function MailBoxFolderListViewModel()
this.iDropOverTimer = 0;
this.allowContacts = !!RL.settingsGet('ContactsIsSupported') && !!RL.settingsGet('ContactsIsAllowed');
this.allowContacts = !!RL.settingsGet('ContactsIsAllowed');
}
Utils.extendAsViewModel('MailBoxFolderListViewModel', MailBoxFolderListViewModel);
@ -12507,7 +12644,6 @@ AbstractData.prototype.populateDataOnStart = function()
this.dropboxEnable(!!RL.settingsGet('AllowDropboxSocial'));
this.dropboxApiKey(RL.settingsGet('DropboxApiKey'));
this.contactsIsSupported(!!RL.settingsGet('ContactsIsSupported'));
this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
};
@ -14218,11 +14354,15 @@ WebMailAjaxRemoteStorage.prototype.quota = function (fCallback)
/**
* @param {?Function} fCallback
* @param {number} iOffset
* @param {number} iLimit
* @param {string} sSearch
*/
WebMailAjaxRemoteStorage.prototype.contacts = function (fCallback, sSearch)
WebMailAjaxRemoteStorage.prototype.contacts = function (fCallback, iOffset, iLimit, sSearch)
{
this.defaultRequest(fCallback, 'Contacts', {
'Offset': iOffset,
'Limit': iLimit,
'Search': sSearch
}, null, '', ['Contacts']);
};
@ -14230,15 +14370,12 @@ WebMailAjaxRemoteStorage.prototype.contacts = function (fCallback, sSearch)
/**
* @param {?Function} fCallback
*/
WebMailAjaxRemoteStorage.prototype.contactSave = function (fCallback, sRequestUid, sUid, sName, sEmail, sImageData)
WebMailAjaxRemoteStorage.prototype.contactSave = function (fCallback, sRequestUid, sUid, aProperties)
{
sUid = Utils.trim(sUid);
this.defaultRequest(fCallback, 'ContactSave', {
'RequestUid': sRequestUid,
'Uid': sUid,
'Name': sName,
'Email': sEmail,
'ImageData': sImageData
'Uid': Utils.trim(sUid),
'Properties': aProperties
});
};
@ -15865,9 +16002,9 @@ RainLoopApp.prototype.getAutocomplete = function (sQuery, fCallback)
;
RL.remote().suggestions(function (sResult, oData) {
if (Enums.StorageResultType.Success === sResult && oData && oData.Result && Utils.isArray(oData.Result.List))
if (Enums.StorageResultType.Success === sResult && oData && Utils.isArray(oData.Result))
{
aData = _.map(oData.Result.List, function (aItem) {
aData = _.map(oData.Result, function (aItem) {
return aItem && aItem[0] ? new EmailModel(aItem[0], aItem[1]) : null;
});
@ -15877,6 +16014,7 @@ RainLoopApp.prototype.getAutocomplete = function (sQuery, fCallback)
{
fCallback([]);
}
}, sQuery);
};
@ -15904,7 +16042,7 @@ RainLoopApp.prototype.bootstart = function ()
bTwitter = RL.settingsGet('AllowTwitterSocial')
;
if (!RL.settingsGet('AllowChangePassword'))
if (!RL.settingsGet('ChangePasswordIsAllowed'))
{
Utils.removeSettingsViewModel(SettingsChangePasswordScreen);
}

14
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long

11
rainloop/v/0.0.0/static/js/libs.js
View file

@ -183,6 +183,17 @@ new a.J;a.La(a.J.Aa);a.b("nativeTemplateEngine",a.J);(function(){a.Ba=function()
new a.w;var b=new a.Ba;0<b.Rb&&a.La(b);a.b("jqueryTmplTemplateEngine",a.Ba)})()})})();})();
/*! Knockout projections plugin
------------------------------------------------------------------------------
Copyright (c) Microsoft Corporation
All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
------------------------------------------------------------------------------
*/
!function(a){"use strict";function b(a,b,c,d,e,f,g){this.inputItem=b,this.stateArrayIndex=c,this.mapping=e,this.arrayOfState=f,this.outputObservableArray=g,this.outputArray=this.outputObservableArray.peek(),this.isIncluded=null,this.suppressNotification=!1,this.outputArrayIndex=a.observable(d),this.mappedValueComputed=a.computed(this.mappingEvaluator,this),this.mappedValueComputed.subscribe(this.onMappingResultChanged,this),this.previousMappedValue=this.mappedValueComputed.peek()}function c(a,b){if(!a)return null;switch(a.status){case"added":return a.index;case"deleted":return a.index+b;default:throw new Error("Unknown diff status: "+a.status)}}function d(a,c,d,e,f,g,h,i,j){var k="number"==typeof c.moved,l=k?d[c.moved]:new b(a,c.value,e,f,g,h,i);return h.splice(e,0,l),l.isIncluded&&j.splice(f,0,l.mappedValueComputed.peek()),k&&(l.stateArrayIndex=e,l.setOutputArrayIndexSilently(f)),l}function e(a,b,c,d,e){var f=b.splice(c,1)[0];f.isIncluded&&e.splice(d,1),"number"!=typeof a.moved&&f.dispose()}function f(a,b,c){return a.stateArrayIndex=b,a.setOutputArrayIndexSilently(c),c+(a.isIncluded?1:0)}function g(a,b){for(var c={},d=0;d<a.length;d++){var e=a[d];"added"===e.status&&"number"==typeof e.moved&&(c[e.moved]=b[e.moved])}return c}function h(a,b,c){return c.length&&b[a.index]?b[a.index].outputArrayIndex.peek():c.length}function i(a,b,i,j,k,l){return b.subscribe(function(b){if(b.length){for(var m=g(b,i),n=0,o=b[0],p=0,q=o&&h(o,i,j),r=o.index;o||r<i.length;r++)if(c(o,p)===r){switch(o.status){case"added":var s=d(a,o,m,r,q,l,i,k,j);s.isIncluded&&q++,p++;break;case"deleted":e(o,i,r,q,j),p--,r--;break;default:throw new Error("Unknown diff status: "+o.status)}n++,o=b[n]}else r<i.length&&(q=f(i[r],r,q));k.valueHasMutated()}},null,"arrayChange")}function j(a,c){for(var d=this,e=[],f=[],g=a.observableArray(f),h=d.peek(),j=0;j<h.length;j++){var k=h[j],l=new b(a,k,j,f.length,c,e,g),n=l.mappedValueComputed.peek();e.push(l),l.isIncluded&&f.push(n)}var o=i(a,d,e,f,g,c),p=a.computed(g).extend({trackArrayChanges:!0}),q=p.dispose;return p.dispose=function(){o.dispose(),a.utils.arrayForEach(e,function(a){a.dispose()}),q.call(this,arguments)},m(a,p),p}function k(a,b){return j.call(this,a,function(a){return b(a)?a:p})}function l(a){function b(a,b){return function(){return b.apply(this,[a].concat(Array.prototype.slice.call(arguments,0)))}}a[q]={map:b(a,j),filter:b(a,k)}}function m(a,b){return a.utils.extend(b,a[q]),b}function n(a){a.projections={_exclusionMarker:p},l(a),m(a,a.observableArray.fn)}function o(){if("undefined"!=typeof module){var b=require("knockout");n(b),module.exports=b}else"ko"in a&&n(a.ko)}var p={};b.prototype.dispose=function(){this.mappedValueComputed.dispose()},b.prototype.mappingEvaluator=function(){var a=this.mapping(this.inputItem,this.outputArrayIndex),b=a!==p;return this.isIncluded!==b&&(null!==this.isIncluded&&this.moveSubsequentItemsBecauseInclusionStateChanged(b),this.isIncluded=b),a},b.prototype.onMappingResultChanged=function(a){a!==this.previousMappedValue&&(this.isIncluded&&this.outputArray.splice(this.outputArrayIndex.peek(),1,a),this.suppressNotification||this.outputObservableArray.valueHasMutated(),this.previousMappedValue=a)},b.prototype.moveSubsequentItemsBecauseInclusionStateChanged=function(a){var b,c,d=this.outputArrayIndex.peek();if(a)for(this.outputArray.splice(d,0,null),b=this.stateArrayIndex+1;b<this.arrayOfState.length;b++)c=this.arrayOfState[b],c.setOutputArrayIndexSilently(c.outputArrayIndex.peek()+1);else for(this.outputArray.splice(d,1),b=this.stateArrayIndex+1;b<this.arrayOfState.length;b++)c=this.arrayOfState[b],c.setOutputArrayIndexSilently(c.outputArrayIndex.peek()-1)},b.prototype.setOutputArrayIndexSilently=function(a){this.suppressNotification=!0,this.outputArrayIndex(a),this.suppressNotification=!1};var q="_ko.projections.cache";o()}(this);
/*! JUA v1.0 MIT */
(function(){function a(a){function l(){if(g&&d<a){var b=g,c=b[0],f=Array.prototype.slice.call(b,1),m=b.index;g===h?g=h=null:g=g.next,++d,f.push(function(a,b){--d;if(i)return;a?e&&k(i=a,e=j=g=h=null):(j[m]=b,--e?l():k(null,j))}),c.apply(null,f)}}var c={},d=0,e=0,f=-1,g,h,i=null,j=[],k=b;return arguments.length<1&&(a=Infinity),c.defer=function(){if(!i){var a=arguments;a.index=++f,h?(h.next=a,h=h.next):g=h=a,++e,l()}return c},c.await=function(a){return k=a,e||k(i,j),c},c}function b(){}typeof module=="undefined"?self.queue=a:module.exports=a,a.version="0.0.2"})();var e=!0,f=null,g=!1,j,k=jQuery,l=window,m=queue;function n(a){return"undefined"===typeof a}function r(a){0<a&&clearTimeout(a)}function u(a){a=a&&(a.originalEvent?a.originalEvent:a)||l.event;return a.dataTransfer?a:f}function v(a,b,c){return!a||!b||n(a[b])?c:a[b]}function y(){for(var a=16,b="",a=n(a)?32:parseInt(a||0,10);b.length<a;)b+="0123456789abcdefghijklmnopqrstuvwxyz".substr(Math.round(36*Math.random()),1);return"jua-uid-"+b+"-"+(new Date).getTime().toString()}
function z(a,b){return{FileName:n(a.fileName)?n(a.name)?f:a.name:a.fileName,Size:n(a.fileSize)?n(a.size)?f:a.size:a.fileSize,Type:n(a.type)?f:a.type,Folder:n(b)?"":b,File:a}}