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

New plugins hooks (contacts suggections).

Browse source
This commit is contained in:
RainLoop Team 2013-12-12 19:06:32 +04:00
parent a69d3150ea
commit a3654a3beb
3 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Boots/RainLoopApp.js
View file

@ -12,9 +12,6 @@ function RainLoopApp()
this.oRemote = null; this.oRemote = null;
this.oCache = null; this.oCache = null;
this.iSuggestionsLimit = Utils.pInt(this.settingsGet('SuggestionsLimit'));
this.iSuggestionsLimit = 0 === this.iSuggestionsLimit ? 20 : this.iSuggestionsLimit;
this.quotaDebounce = _.debounce(this.quota, 1000 * 30); this.quotaDebounce = _.debounce(this.quota, 1000 * 30);
$.wakeUp(function () { $.wakeUp(function () {

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

@ -894,7 +894,6 @@ class Actions
'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''), 'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
'AllowThemes' => (bool) $oConfig->Get('webmail', 'allow_themes', true), 'AllowThemes' => (bool) $oConfig->Get('webmail', 'allow_themes', true),
'AllowCustomTheme' => (bool) $oConfig->Get('webmail', 'allow_custom_theme', true), 'AllowCustomTheme' => (bool) $oConfig->Get('webmail', 'allow_custom_theme', true),
'SuggestionsLimit' => (int) $oConfig->Get('labs', 'suggestions_limit', 50),
'ChangePasswordIsAllowed' => false, 'ChangePasswordIsAllowed' => false,
'ContactsIsAllowed' => false, 'ContactsIsAllowed' => false,
'JsHash' => \md5(\RainLoop\Utils::GetConnectionToken()), 'JsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),
@ -4087,8 +4086,6 @@ class Actions
*/ */
public function DoContactSave() public function DoContactSave()
{ {
$iStart = \time();
$oAccount = $this->getAccountFromToken(); $oAccount = $this->getAccountFromToken();
$bResult = false; $bResult = false;
@ -4125,11 +4122,6 @@ class Actions
$bResult = $oPab->ContactSave($oAccount, $oContact); $bResult = $oPab->ContactSave($oAccount, $oContact);
} }
if (\time() === $iStart)
{
sleep(1);
}
return $this->DefaultResponse(__FUNCTION__, array( return $this->DefaultResponse(__FUNCTION__, array(
'RequestUid' => $sRequestUid, 'RequestUid' => $sRequestUid,
'ResultID' => $bResult ? $oContact->IdContact : '', 'ResultID' => $bResult ? $oContact->IdContact : '',
@ -4145,12 +4137,49 @@ class Actions
$oAccount = $this->getAccountFromToken(); $oAccount = $this->getAccountFromToken();
$sQuery = \trim($this->GetActionParam('Query', '')); $sQuery = \trim($this->GetActionParam('Query', ''));
$iLimit = (int) $this->Config()->Get('contacts', 'suggestions_limit', 20);
$aResult = array(); $aResult = array();
$oPab = $this->PersonalAddressBookProvider($oAccount);
if (0 < \strlen($sQuery) && $oPab->IsActive()) $this->Plugins()->RunHook('ajax.suggestions-input-parameters', array(&$sQuery, &$iLimit, $oAccount));
$iLimit = (int) $iLimit;
if (5 > $iLimit)
{ {
$aResult = $oPab->GetSuggestions($oAccount, $sQuery); $iLimit = 5;
}
$this->Plugins()->RunHook('ajax.suggestions-pre', array(&$aResult, $sQuery, $oAccount, $iLimit));
if ($iLimit > \count($aResult) && 0 < \strlen($sQuery))
{
// Personal Address Book
$oPab = $this->PersonalAddressBookProvider($oAccount);
if ($oPab && $oPab->IsActive())
{
$aSuggestions = $oPab->GetSuggestions($oAccount, $sQuery, $iLimit);
if (0 === \count($aResult))
{
$aResult = $aSuggestions;
}
else
{
$aResult = \array_merge($aResult, $aSuggestions);
}
}
}
if ($iLimit < \count($aResult))
{
$aResult = \array_slice($aResult, 0, $iLimit);
}
// Plugins
$this->Plugins()->RunHook('ajax.suggestions-post', array(&$aResult, $sQuery, $oAccount, $iLimit));
if ($iLimit < \count($aResult))
{
$aResult = \array_slice($aResult, 0, $iLimit);
} }
return $this->DefaultResponse(__FUNCTION__, $aResult); return $this->DefaultResponse(__FUNCTION__, $aResult);
@ -4190,9 +4219,9 @@ class Actions
$sFolder = $this->GetActionParam('Folder', ''); $sFolder = $this->GetActionParam('Folder', '');
$bSetAction = '1' === (string) $this->GetActionParam('SetAction', '0'); $bSetAction = '1' === (string) $this->GetActionParam('SetAction', '0');
$aUids = explode(',', (string) $this->GetActionParam('Uids', '')); $aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = array_filter($aUids, function (&$sUid) { $aFilteredUids = \array_filter($aUids, function (&$sUid) {
$sUid = (int) trim($sUid); $sUid = (int) \trim($sUid);
return 0 < $sUid; return 0 < $sUid;
}); });

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

@ -83,6 +83,7 @@ class Application extends \RainLoop\Config\AbstractConfig
'contacts' => array( 'contacts' => array(
'enable' => array(false, 'Enable contacts'), 'enable' => array(false, 'Enable contacts'),
'suggestions_limit' => array(30),
'type' => array('mysql', ''), 'type' => array('mysql', ''),
'pdo_dsn' => array('mysql:host=127.0.0.1;port=3306;dbname=rainloop', ''), 'pdo_dsn' => array('mysql:host=127.0.0.1;port=3306;dbname=rainloop', ''),
'pdo_user' => array('root', ''), 'pdo_user' => array('root', ''),
@ -205,7 +206,6 @@ Enables caching in the system'),
'use_app_debug_css' => array(false), 'use_app_debug_css' => array(false),
'login_fault_delay' => array(1), 'login_fault_delay' => array(1),
'log_ajax_response_write_limit' => array(300), 'log_ajax_response_write_limit' => array(300),
'suggestions_limit' => array(50),
'determine_user_language' => array(true), 'determine_user_language' => array(true),
'use_imap_sort' => array(false), 'use_imap_sort' => array(false),
'use_imap_force_selection' => array(false), 'use_imap_force_selection' => array(false),