Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 04:29:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sieve filters (pre release)

Browse source
This commit is contained in:
RainLoop Team 2015-01-29 01:24:58 +04:00
parent 63a286a6b6
commit 0152f1583b
38 changed files with 175 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rainloop/v/0.0.0/app/libraries/RainLoop/Notifications.php
View file

@ -37,7 +37,8 @@ class Notifications
const InvalidRecipients = 303;
const CantSaveFilters = 351;
const FiltersAreNotCorrect = 352;
const CantGetFilters = 352;
const FiltersAreNotCorrect = 355;
const CantCreateFolder = 400;
const CantRenameFolder = 401;
@ -111,6 +112,7 @@ class Notifications
self::CantSendMessage => 'CantSendMessage',
self::InvalidRecipients => 'InvalidRecipients',
self::CantSaveFilters => 'CantSaveFilters',
self::CantGetFilters => 'CantGetFilters',
self::FiltersAreNotCorrect => 'FiltersAreNotCorrect',
self::CantCreateFolder => 'CantCreateFolder',

15
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
View file

@ -25,7 +25,20 @@ class Filters extends \RainLoop\Providers\AbstractProvider
*/
public function Load($oAccount, $bAllowRaw = false)
{
return $this->IsActive() ? $this->oDriver->Load($oAccount, $bAllowRaw) : array();
try
{
return $this->IsActive() ? $this->oDriver->Load($oAccount, $bAllowRaw) : array();
}
catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException);
}
catch (\Exception $oException)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetFilters, $oException);
}
return false;
}
/**

15
rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html
View file

@ -4,7 +4,7 @@
<span class="i18n" data-i18n-text="SETTINGS_FILTERS/LEGEND_FILTERS"></span>
</div>
</div>
<div class="row">
<div class="row" data-bind="visible: inited() && !serverError()">
<div class="span8">
<a class="btn" data-bind="click: addFilter">
<i class="icon-plus"></i>
@ -36,6 +36,15 @@
</div>
</div>
</div>
<div class="row" data-bind="visible: serverError">
<div class="span8">
<div class="alert alert-error g-ui-user-select-none" style="margin-bottom: 0">
<i class="icon-warning"></i>
&nbsp;&nbsp;
<span data-bind="text: serverErrorDesc"></span>
</div>
</div>
</div>
<div class="row">
<div class="span8">
<div class="process-place g-ui-user-select-none" data-bind="style: {'visibility': visibility }">
@ -43,7 +52,7 @@
&nbsp;&nbsp;
<span data-bind="text: processText"></span>
</div>
<div class="control-group" data-bind="css: {'error': filterRaw.error}, visible: filterRaw.allow() && filterRaw.active()">
<div class="control-group" data-bind="css: {'error': filterRaw.error}, visible: inited() && filterRaw.allow() && filterRaw.active()">
<div class="controls">
<pre style="word-break: break-word;" data-bind="visible: '' !== filterRaw.capa()">
<b class="i18n" data-i18n-text="SETTINGS_FILTERS/CAPABILITY_LABEL"></b>:
@ -54,7 +63,7 @@
</div>
</div>
<table class="table table-hover list-table g-ui-user-select-none"
data-bind="visible: !filterRaw.active() || !filterRaw.active(), i18nUpdate: filters">
data-bind="visible: inited() && (!filterRaw.active() || !filterRaw.active()), i18nUpdate: filters">
<colgroup>
<col style="width: 30px" />
<col />

1
rainloop/v/0.0.0/langs/bg.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Can't save message"
CANT_SEND_MESSAGE = "Can't send message"
INVALID_RECIPIENTS = "Invalid recipients"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Can't create folder"
CANT_RENAME_FOLDER = "Can't rename folder"

1
rainloop/v/0.0.0/langs/de.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Diese Nachricht kann nicht gespeichert werden"
CANT_SEND_MESSAGE = "Diese Nachricht kann nicht gesendet werden"
INVALID_RECIPIENTS = "Ungültige Empfänger-Adresse"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Dieser Ordner kann nicht angelegt werden"
CANT_RENAME_FOLDER = "Dieser Ordner kann nicht umbenannt werden"

1
rainloop/v/0.0.0/langs/en.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Can't save message"
CANT_SEND_MESSAGE = "Can't send message"
INVALID_RECIPIENTS = "Invalid recipients"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Can't create folder"
CANT_RENAME_FOLDER = "Can't rename folder"

1
rainloop/v/0.0.0/langs/es.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "No se puede guardar el mensaje"
CANT_SEND_MESSAGE = "No se puede enviar el mensaje"
INVALID_RECIPIENTS = "Los destinatarios no son válidos"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "No se puede crear la carpeta"
CANT_RENAME_FOLDER = "No se puede renombrar la carpeta"

1
rainloop/v/0.0.0/langs/fr.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Impossible d'enregistrer le message"
CANT_SEND_MESSAGE = "Impossible d'envoyer le message"
INVALID_RECIPIENTS = "Destinataires invalides"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Impossible de créer le dossier"
CANT_RENAME_FOLDER = "Impossible de renommer le dossier"

1
rainloop/v/0.0.0/langs/hu.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Can't save message"
CANT_SEND_MESSAGE = "Can't send message"
INVALID_RECIPIENTS = "Invalid recipients"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Can't create folder"
CANT_RENAME_FOLDER = "Can't rename folder"

1
rainloop/v/0.0.0/langs/is.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Get ekki vistað bréf"
CANT_SEND_MESSAGE = "Get ekki sent bréf"
INVALID_RECIPIENTS = "Rangir viðtakendur"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Get ekki búið til möppu"
CANT_RENAME_FOLDER = "Get ekki endurnefnt möppu"

1
rainloop/v/0.0.0/langs/it.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Impossibile salvare il messaggio"
CANT_SEND_MESSAGE = "Impossibile incollare il messaggio"
INVALID_RECIPIENTS = "Destinatario non valido"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Impossibile creare la cartella"
CANT_RENAME_FOLDER = "Impossibile rinominare la cartella"

1
rainloop/v/0.0.0/langs/ja-jp.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Can't save message"
CANT_SEND_MESSAGE = "Can't send message"
INVALID_RECIPIENTS = "Invalid recipients"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Can't create folder"
CANT_RENAME_FOLDER = "Can't rename folder"

1
rainloop/v/0.0.0/langs/ko-kr.ini
View file

@ -632,6 +632,7 @@ CANT_SAVE_MESSAGE = "메시지를 저장할 수 없습니다."
CANT_SEND_MESSAGE = "메시지를 보낼 수 없습니다."
INVALID_RECIPIENTS = "수신인 오류"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "폴더를 생성할 수 없습니다."
CANT_RENAME_FOLDER = "폴더명을 변경할 수 없습니다."

1
rainloop/v/0.0.0/langs/lt.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Nepavyko išsaugoti laiško"
CANT_SEND_MESSAGE = "Nepavyko išsiųsti laiško"
INVALID_RECIPIENTS = "Netinkamas gavėjas"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Nepavyksta sukurti katalogo"
CANT_RENAME_FOLDER = "Nepavyksta pervadinti katalogo"

1
rainloop/v/0.0.0/langs/lv.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Nevar saglabāt ziņojumu"
CANT_SEND_MESSAGE = "Nevar nosūtīt ziņojumu"
INVALID_RECIPIENTS = "Nepareizi saņēmēji"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Nevar izveidot mapi"
CANT_RENAME_FOLDER = "Nevar pārsaukt mapi"

1
rainloop/v/0.0.0/langs/nl.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Kan bericht niet opslaan"
CANT_SEND_MESSAGE = "Kan bericht niet verzenden"
INVALID_RECIPIENTS = "Onjuiste ontvangers"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Kan map niet aanmaken"
CANT_RENAME_FOLDER = "Kan map niet hernoemen"

1
rainloop/v/0.0.0/langs/no.ini
View file

@ -634,6 +634,7 @@ CANT_SAVE_MESSAGE = "Kan ikke lagre melding"
CANT_SEND_MESSAGE = "Kan ikke sende melding"
INVALID_RECIPIENTS = "Ugyldige mottakere"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Kan ikke opprette mappe"
CANT_RENAME_FOLDER = "Kan ikke endre navn på mappen"

1
rainloop/v/0.0.0/langs/pl.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Nie można zapisać wiadomości"
CANT_SEND_MESSAGE = "Nie można wysłać wiadomości"
INVALID_RECIPIENTS = "Nieprawidłowy adres odbiorcy"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Nie można utworzyć folderu"
CANT_RENAME_FOLDER = "Nie można zmienić nazwy folderu"

1
rainloop/v/0.0.0/langs/pt-br.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Não foi possível salvar a mensagem"
CANT_SEND_MESSAGE = "Não foi possível enviar a mensagem"
INVALID_RECIPIENTS = "Destinatário inválido"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Não foi possível criar a pasta"
CANT_RENAME_FOLDER = "Não foi possível renomear a pasta"

1
rainloop/v/0.0.0/langs/pt-pt.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Não é possível salvar a mensagem"
CANT_SEND_MESSAGE = "Não é possível enviar a mensagem"
INVALID_RECIPIENTS = "Destinatário invpalido"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Não é possível criar esta pasta"
CANT_RENAME_FOLDER = "Não é possível renomear esta pasta"

1
rainloop/v/0.0.0/langs/ro.ini
View file

@ -634,6 +634,7 @@ CANT_SAVE_MESSAGE = "Nu pot salva mesajul. Încercați din nou"
CANT_SEND_MESSAGE = "Nu pot trimite scrisoarea.Încercați din nou"
INVALID_RECIPIENTS = "Verificați dacă ați introdus toate adresele."
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Nu crea dosarul. Încercați din nou"
CANT_RENAME_FOLDER = "Nu pot redenumi dosarul. Încercați din nou"

1
rainloop/v/0.0.0/langs/ru.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Не могу сохранить письмо"
CANT_SEND_MESSAGE = "Не могу отправить письмо"
INVALID_RECIPIENTS = "Проверьте правильность ввода всех адресов."
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Не могу создать папку"
CANT_RENAME_FOLDER = "Не могу переименовать папку"

1
rainloop/v/0.0.0/langs/sk.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Správu sa nepodarilo uložiť"
CANT_SEND_MESSAGE = "Správu sa nepodarilo odoslať"
INVALID_RECIPIENTS = "Neplatný príjemcovia"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Priečinok sa nepodarilo vytvoriť"
CANT_RENAME_FOLDER = "Priečinok sa nepodarilo premenovať"

1
rainloop/v/0.0.0/langs/sv.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Kan inte spara meddelande"
CANT_SEND_MESSAGE = "Kan inte skicka meddelande"
INVALID_RECIPIENTS = "Ogiltig mottagare"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Kan inte skapa mapp"
CANT_RENAME_FOLDER = "Kan inte byta namn på mapp"

1
rainloop/v/0.0.0/langs/tr.ini
View file

@ -633,6 +633,7 @@ CANT_SAVE_MESSAGE = "Mesaj kaydedilemedi"
CANT_SEND_MESSAGE = "Mesaj gönderilemedi"
INVALID_RECIPIENTS = "Geçersiz alıcılar"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Klasör oluşturulamadı"
CANT_RENAME_FOLDER = "Klasör oluşturulamadı"

1
rainloop/v/0.0.0/langs/ua.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "Не можу зберегти листа"
CANT_SEND_MESSAGE = "Не можу відправити листа"
INVALID_RECIPIENTS = "Перевірити правильність вводу всіх адрес."
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "Не можу створити теку"
CANT_RENAME_FOLDER = "Не можу перейменувати теку"

1
rainloop/v/0.0.0/langs/zh-cn.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "无法保存邮件"
CANT_SEND_MESSAGE = "无法发送邮件"
INVALID_RECIPIENTS = "无效接收人"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "无法创建文件夹"
CANT_RENAME_FOLDER = "无法重命名文件夹"

1
rainloop/v/0.0.0/langs/zh-tw.ini
View file

@ -635,6 +635,7 @@ CANT_SAVE_MESSAGE = "無法保存郵件"
CANT_SEND_MESSAGE = "無法發送郵件"
INVALID_RECIPIENTS = "無效接收人"
CANT_SAVE_FILTERS = "Can't save filters"
CANT_GET_FILTERS = "Can't get filters"
FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
CANT_CREATE_FOLDER = "無法創建資料夾"
CANT_RENAME_FOLDER = "無法重命名資料夾"