- Managesieve 2.0: multi-script support

release-0.6
alecpl 15 years ago
parent 598212252c
commit ac67db1980

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Managesieve 2.0: multi-script support
- Fix imap_auth_type regression (#1486263)
RELEASE 0.3.1

@ -1,3 +1,10 @@
* version 2.0 [2009-11-02]
-----------------------------------------------------------
- Added 'managesieve_debug' option
- Added multi-script support
- Small css improvements + sprite image buttons
- PEAR::NetSieve 1.2.0b1
* version 1.7 [2009-09-20]
-----------------------------------------------------------
- Support multiple managesieve hosts using %h variable

@ -31,4 +31,7 @@ $rcmail_config['managesieve_replace_delimiter'] = '';
// Note: not all extensions are implemented
$rcmail_config['managesieve_disabled_extensions'] = array();
// Enables debugging of conversation with sieve server. Logs it into <log_dir>/sieve
$rcmail_config['managesieve_debug'] = false;
?>

File diff suppressed because it is too large Load Diff

@ -16,19 +16,22 @@ define('SIEVE_ERROR_LOGIN', 2);
define('SIEVE_ERROR_NOT_EXISTS', 3); // script not exists
define('SIEVE_ERROR_INSTALL', 4); // script installation
define('SIEVE_ERROR_ACTIVATE', 5); // script activation
define('SIEVE_ERROR_DELETE', 6); // script deletion
define('SIEVE_ERROR_INTERNAL', 7); // internal error
define('SIEVE_ERROR_OTHER', 255); // other/unknown error
class rcube_sieve
{
var $sieve; // Net_Sieve object
var $error = false; // error flag
var $list = array(); // scripts list
private $sieve; // Net_Sieve object
private $error = false; // error flag
private $list = array(); // scripts list
public $script; // rcube_sieve_script object
private $disabled; // array of disabled extensions
public $script; // rcube_sieve_script object
public $current; // name of currently loaded script
private $disabled; // array of disabled extensions
/**
/**
* Object constructor
*
* @param string Username (to managesieve login)
@ -38,137 +41,259 @@ class rcube_sieve
* @param string Enable/disable TLS use
* @param array Disabled extensions
*/
public function __construct($username, $password='', $host='localhost', $port=2000, $usetls=true, $disabled=array())
public function __construct($username, $password='', $host='localhost', $port=2000,
$usetls=true, $disabled=array(), $debug=false)
{
$this->sieve = new Net_Sieve();
$this->sieve = new Net_Sieve();
if ($debug)
$this->sieve->setDebug(true, array($this, 'debug_handler'));
// $this->sieve->setDebug();
if (PEAR::isError($this->sieve->connect($host, $port, NULL, $usetls)))
return $this->_set_error(SIEVE_ERROR_CONNECTION);
if (PEAR::isError($this->sieve->connect($host, $port, NULL, $usetls)))
return $this->_set_error(SIEVE_ERROR_CONNECTION);
if (PEAR::isError($this->sieve->login($username, $password)))
return $this->_set_error(SIEVE_ERROR_LOGIN);
if (PEAR::isError($this->sieve->login($username, $password)))
return $this->_set_error(SIEVE_ERROR_LOGIN);
$this->disabled = $disabled;
$this->_get_script();
$this->disabled = $disabled;
}
/**
/**
* Getter for error code
*/
public function error()
public function error()
{
return $this->error ? $this->error : false;
return $this->error ? $this->error : false;
}
public function save()
/**
* Saves current script into server
*/
public function save($name = null)
{
$script = $this->script->as_text();
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if (!$this->script)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if (!$name)
$name = $this->current;
if (!$script)
$script = '/* empty script */';
$script = $this->script->as_text();
if (PEAR::isError($this->sieve->installScript('roundcube', $script)))
return $this->_set_error(SIEVE_ERROR_INSTALL);
if (!$script)
$script = '/* empty script */';
if (PEAR::isError($this->sieve->setActive('roundcube')))
return $this->_set_error(SIEVE_ERROR_ACTIVATE);
if (PEAR::isError($this->sieve->installScript($name, $script)))
return $this->_set_error(SIEVE_ERROR_INSTALL);
return true;
return true;
}
public function get_extensions()
/**
* Saves text script into server
*/
public function save_script($name, $content = null)
{
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if (!$content)
$content = '/* empty script */';
if (PEAR::isError($this->sieve->installScript($name, $content)))
return $this->_set_error(SIEVE_ERROR_INSTALL);
return true;
}
/**
* Activates specified script
*/
public function activate($name = null)
{
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if (!$name)
$name = $this->current;
if (PEAR::isError($this->sieve->setActive($name)))
return $this->_set_error(SIEVE_ERROR_ACTIVATE);
return true;
}
/**
* Removes specified script
*/
public function remove($name = null)
{
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if (!$name)
$name = $this->current;
// script must be deactivated first
if ($name == $this->sieve->getActive())
if (PEAR::isError($this->sieve->setActive('')))
return $this->_set_error(SIEVE_ERROR_DELETE);
if (PEAR::isError($this->sieve->removeScript($name)))
return $this->_set_error(SIEVE_ERROR_DELETE);
if ($name == $this->current)
$this->current = null;
return true;
}
/**
* Gets list of supported by server Sieve extensions
*/
public function get_extensions()
{
if ($this->sieve) {
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
$ext = $this->sieve->getExtensions();
// we're working on lower-cased names
$ext = array_map('strtolower', (array) $ext);
if ($this->script) {
$supported = $this->script->get_extensions();
foreach ($ext as $idx => $ext_name)
if (!in_array($ext_name, $supported))
unset($ext[$idx]);
$supported = $this->script->get_extensions();
foreach ($ext as $idx => $ext_name)
if (!in_array($ext_name, $supported))
unset($ext[$idx]);
}
return array_values($ext);
}
return array_values($ext);
}
private function _get_script()
/**
* Gets list of scripts from server
*/
public function get_scripts()
{
if (!$this->sieve)
return false;
if (!$this->list) {
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
$this->list = $this->sieve->listScripts();
$this->list = $this->sieve->listScripts();
if (PEAR::isError($this->list))
return $this->_set_error(SIEVE_ERROR_OTHER);
}
return $this->list;
}
if (PEAR::isError($this->list))
return $this->_set_error(SIEVE_ERROR_OTHER);
/**
* Returns active script name
*/
public function get_active()
{
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
return $this->sieve->getActive();
}
if (in_array('roundcube', $this->list))
{
$script = $this->sieve->getScript('roundcube');
/**
* Loads script by name
*/
public function load($name)
{
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if ($this->current == $name)
return true;
$script = $this->sieve->getScript($name);
if (PEAR::isError($script))
if (PEAR::isError($script))
return $this->_set_error(SIEVE_ERROR_OTHER);
}
// import scripts from squirrelmail
elseif (in_array('phpscript', $this->list))
{
$script = $this->sieve->getScript('phpscript');
$script = $this->_convert_from_squirrel_rules($script);
// try to parse from Roundcube format
$this->script = new rcube_sieve_script($script, $this->disabled);
$this->script = new rcube_sieve_script($script, $this->disabled);
$this->save();
// ... else try Squirrelmail format
if (empty($this->script->content) && $name == 'phpscript') {
$script = $this->sieve->getScript('roundcube');
$script = $this->sieve->getScript('phpscript');
$script = $this->_convert_from_squirrel_rules($script);
if (PEAR::isError($script))
return $this->_set_error(SIEVE_ERROR_OTHER);
}
else
{
$this->_set_error(SIEVE_ERROR_NOT_EXISTS);
$script = '';
}
$this->script = new rcube_sieve_script($script, $this->disabled);
}
$this->current = $name;
$this->script = new rcube_sieve_script($script, $this->disabled);
return true;
}
/**
* Creates empty script or copy of other script
*/
public function copy($name, $copy)
{
if (!$this->sieve)
return $this->_set_error(SIEVE_ERROR_INTERNAL);
if ($copy) {
$content = $this->sieve->getScript($copy);
private function _convert_from_squirrel_rules($script)
if (PEAR::isError($content))
return $this->_set_error(SIEVE_ERROR_OTHER);
}
return $this->save_script($name, $content);
}
private function _convert_from_squirrel_rules($script)
{
$i = 0;
$name = array();
// tokenize rules
if ($tokens = preg_split('/(#START_SIEVE_RULE.*END_SIEVE_RULE)\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE))
foreach($tokens as $token)
{
if (preg_match('/^#START_SIEVE_RULE.*/', $token, $matches))
{
$name[$i] = "unnamed rule ".($i+1);
$content .= "# rule:[".$name[$i]."]\n";
}
elseif (isset($name[$i]))
{
$content .= "if ".$token."\n";
$i++;
}
}
$i = 0;
$name = array();
// tokenize rules
if ($tokens = preg_split('/(#START_SIEVE_RULE.*END_SIEVE_RULE)\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE))
foreach($tokens as $token) {
if (preg_match('/^#START_SIEVE_RULE.*/', $token, $matches)) {
$name[$i] = "unnamed rule ".($i+1);
$content .= "# rule:[".$name[$i]."]\n";
}
elseif (isset($name[$i])) {
$content .= "if $token\n";
$i++;
}
}
return $content;
return $content;
}
private function _set_error($error)
{
$this->error = $error;
return false;
}
private function _set_error($error)
/**
* This is our own debug handler for connection
* @access public
*/
public function debug_handler(&$sieve, $message)
{
$this->error = $error;
return false;
}
write_log('sieve', preg_replace('/\r\n$/', '', $message));
}
}
class rcube_sieve_script
{
var $content = array(); // script rules array
public $content = array(); // script rules array
private $supported = array( // extensions supported by class
'fileinto',

@ -39,7 +39,7 @@ $messages['filterunknownerror'] = 'Неизвестна грешка на сър
$messages['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра ';
$messages['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
$messages['filterdeleted'] = 'Филтърът е изтрит успешно';
$messages['filterconfirmdelete'] = 'Наистина ли искате да изтриете избрания филтър?';
$messages['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
$messages['filtersaved'] = 'Филтърът е записан успешно';
$messages['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
$messages['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';

@ -50,7 +50,7 @@ $messages['filterunknownerror'] = 'Neznámá chyba serveru';
$messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
$messages['filterdeleted'] = 'Filtr byl smazán';
$messages['filterconfirmdelete'] = 'Opravdu chcete smazat vybraný filtr?';
$messages['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
$messages['filtersaved'] = 'Filtr byl uložen';
$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
$messages['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';

@ -41,7 +41,7 @@ $messages['filterunknownerror'] = 'Unbekannter Serverfehler';
$messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
$messages['filterdeleteerror'] = 'Fehler beim des löschen Filters. Serverfehler';
$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
$messages['filterconfirmdelete'] = 'Möchten Sie den Filter löschen ?';
$messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
$messages['filtersaved'] = 'Filter gespeichert';
$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
$messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';

@ -42,7 +42,7 @@ $messages['filterunknownerror'] = 'Unbekannter Serverfehler';
$messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
$messages['filterdeleteerror'] = 'Fehler beim Löschen des Filters. Serverfehler';
$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
$messages['filterconfirmdelete'] = 'Möchten Sie den Filter löschen?';
$messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen?';
$messages['filtersaved'] = 'Filter gespeichert';
$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
$messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';

@ -42,7 +42,7 @@ $messages['filterunknownerror'] = 'Unknown server error';
$messages['filterconnerror'] = 'Unable to connect to managesieve server';
$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
$messages['filterdeleted'] = 'Filter deleted successfully';
$messages['filterconfirmdelete'] = 'Do you really want to delete selected filter?';
$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
$messages['filtersaved'] = 'Filter saved successfully';
$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';

@ -36,18 +36,37 @@ $labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma sepa
$labels['vacationdays'] = 'How often send messages (in days):';
$labels['vacationreason'] = 'Message body (vacation reason):';
$labels['rulestop'] = 'Stop evaluating rules';
$labels['filterset'] = 'Filters set';
$labels['filtersetadd'] = 'Add filters set';
$labels['filtersetdel'] = 'Delete current filters set';
$labels['filtersetact'] = 'Activate current filters set';
$labels['filterdef'] = 'Filter definition';
$labels['filtersetname'] = 'Filters set name';
$labels['newfilterset'] = 'New filters set';
$labels['active'] = 'active';
$labels['copyfromset'] = 'Copy filters from set';
$labels['none'] = '- none -';
$messages = array();
$messages['filterunknownerror'] = 'Unknown server error';
$messages['filterconnerror'] = 'Unable to connect to managesieve server';
$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
$messages['filterdeleted'] = 'Filter deleted successfully';
$messages['filterconfirmdelete'] = 'Do you really want to delete selected filter?';
$messages['filtersaved'] = 'Filter saved successfully';
$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
$messages['filtersaveerror'] = 'Unable to save filter. Server error occured';
$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
$messages['forbiddenchars'] = 'Forbidden characters in field';
$messages['cannotbeempty'] = 'Field cannot be empty';
$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured';
$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured';
$messages['setactivated'] = 'Filters set activated successfully';
$messages['setdeleted'] = 'Filters set deleted successfully';
$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
$messages['setcreateerror'] = 'Unable to create filters set. Server error occured';
$messages['setcreated'] = 'Filters set created successfully';
$messages['emptyname'] = 'Unable to create filters set. Empty set name';
$messages['nametoolong'] = 'Unable to create filters set. Name too long'
?>

@ -43,7 +43,7 @@ $messages['filterunknownerror'] = 'Error desconocido de servidor';
$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
$messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
$messages['filterconfirmdelete'] = '¿Realmente desea borrar el filtro seleccionado?';
$messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
$messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
$messages['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
$messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';

@ -42,7 +42,7 @@ $messages['filterunknownerror'] = 'Tundmatu serveri tõrge';
$messages['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
$messages['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
$messages['filterdeleted'] = 'Filter edukalt kustutatud';
$messages['filterconfirmdelete'] = 'Soovid valitud filtri kustutada?';
$messages['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
$messages['filtersaved'] = 'Filter edukalt salvestatud';
$messages['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
$messages['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';

@ -38,7 +38,7 @@ $messages['filterunknownerror'] = 'Tuntematon palvelin virhe';
$messages['filterconnerror'] = 'Yhdistäminen palvelimeen epäonnistui';
$messages['filterdeleteerror'] = 'Suodattimen poistaminen epäonnistui. Palvelin virhe';
$messages['filterdeleted'] = 'Suodatin poistettu';
$messages['filterconfirmdelete'] = 'Haluatko varmasti poistaa valitut suodattimet?';
$messages['filterdeleteconfirm'] = 'Haluatko varmasti poistaa valitut suodattimet?';
$messages['filtersaved'] = 'Suodatin tallennettu';
$messages['filtersaveerror'] = 'Suodattimen tallennus epäonnistui. Palvelin virhe';
$messages['ruledeleteconfirm'] = 'Haluatko poistaa valitut säännöt?';

@ -42,7 +42,7 @@ $messages['filterunknownerror'] = 'Erreur du serveur inconnue';
$messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
$messages['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
$messages['filterdeleted'] = 'Le filtre a bien été supprimé';
$messages['filterconfirmdelete'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
$messages['filtersaved'] = 'Le filtre a bien été enregistré';
$messages['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';

@ -43,7 +43,7 @@ $messages['filterunknownerror'] = 'Ismeretlen szerverhiba';
$messages['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
$messages['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
$messages['filterdeleted'] = 'A szűrő törlése sikeres';
$messages['filterconfirmdelete'] = 'Biztosan törli ezt a szűrőt?';
$messages['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
$messages['filtersaved'] = 'A szűrő mentése sikeres';
$messages['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
$messages['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';

@ -43,7 +43,7 @@ $messages['filterunknownerror'] = 'Errore sconosciuto del server';
$messages['filterconnerror'] = 'Collegamento al server managesieve fallito';
$messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
$messages['filterdeleted'] = 'Filtro eliminato con successo';
$messages['filterconfirmdelete'] = 'Vuoi veramente eliminare il filtro selezionato?';
$messages['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
$messages['filtersaved'] = 'Filtro salvato con successo';
$messages['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
$messages['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';

@ -38,7 +38,7 @@ $messages['filterunknownerror'] = 'Onbekende fout';
$messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
$messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
$messages['filterdeleted'] = 'Filter succesvol verwijderd';
$messages['filterconfirmdelete'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
$messages['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
$messages['filtersaved'] = 'Filter succesvol opgeslagen';
$messages['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
$messages['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';

@ -37,18 +37,37 @@ $labels['rulestop'] = 'Przerwij przetwarzanie reguł';
$labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
$labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
$labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
$labels['filterset'] = 'Zbiór filtrów';
$labels['filtersetadd'] = 'Dodaj zbiór filtrów';
$labels['filtersetdel'] = 'Usuń bierzący zbiór filtrów';
$labels['filtersetact'] = 'Aktywuj bierzący zbiór filtrów';
$labels['filterdef'] = 'Definicja filtra';
$labels['filtersetname'] = 'Nazwa zbioru filtrów';
$labels['newfilterset'] = 'Nowy zbiór filtrów';
$labels['active'] = 'aktywny';
$labels['copyfromset'] = 'Skopiuj filtry ze zbioru';
$labels['none'] = '- brak -';
$messages = array();
$messages['filterunknownerror'] = 'Nieznany błąd serwera';
$messages['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem managesieve';
$messages['filterdeleteerror'] = 'Nie można usunąć filtra. Wystąpił błąd serwera';
$messages['filterdeleted'] = 'Filtr został usunięty pomyślnie';
$messages['filterconfirmdelete'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
$messages['filterdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
$messages['filtersaved'] = 'Filtr został zapisany pomyślnie';
$messages['filtersaveerror'] = 'Nie można zapisać filtra. Wystąpił błąd serwera.';
$messages['ruledeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną regułę?';
$messages['actiondeleteconfirm'] = 'Czy na pewno usunąć wybraną akcję?';
$messages['forbiddenchars'] = 'Pole zawiera niedozwolone znaki';
$messages['cannotbeempty'] = 'Pole nie może być puste';
$messages['setactivateerror'] = 'Nie można aktywować wybranego zbioru filtrów. Błąd serwera';
$messages['setdeleteerror'] = 'Nie można usunąć wybranego zbioru filtrów. Błąd serwera';
$messages['setactivated'] = 'Zbiór filtrów został aktywowany pomyślnie';
$messages['setdeleted'] = 'Zbiór filtrów został usunięty pomyślnie';
$messages['setdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany zbiór filtrów?';
$messages['setcreateerror'] = 'Nie można utworzyć zbioru filtrów. Błąd serwera';
$messages['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie';
$messages['emptyname'] = 'Nie można utworzyć zbioru filtrów. Pusta nazwa zbioru';
$messages['nametoolong'] = 'Nie można utworzyć zbioru filtrów. Nazwa zbyt długa'
?>

@ -42,7 +42,7 @@ $messages['filterunknownerror'] = 'Erro desconhecido de servidor';
$messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
$messages['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
$messages['filterdeleted'] = 'Filtro excluído com sucesso';
$messages['filterconfirmdelete'] = 'Deseja realmente excluir o filtro selecionado?';
$messages['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
$messages['filtersaved'] = 'Filtro gravado com sucesso';
$messages['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
$messages['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';

@ -32,17 +32,13 @@ $labels['add'] = 'Добавить';
$labels['del'] = 'Удалить';
$labels['sender'] = 'Отправитель';
$labels['recipient'] = 'Получатель';
$labels['vacationaddresses'] = 'Список дополнительных адресов почты (разделённый запятыми):';
$labels['vacationdays'] = 'Как часто отправлять сообщение (раз в сколько дней):';
$labels['vacationreason'] = 'Текст сообщения (причины отсутствия):';
$labels['rulestop'] = 'Не обрабатывать последующие правила';
$messages = array();
$messages['filterunknownerror'] = 'Неизвестная ошибка сервера';
$messages['filterconnerror'] = 'Невозможно подсоединится к серверу фильтров';
$messages['filterdeleteerror'] = 'Невозможно удалить фильтр. Ошибка сервера';
$messages['filterdeleted'] = 'Фильтр успешно удалён';
$messages['filterconfirmdelete'] = 'Вы действительно хотите удалить фильтр?';
$messages['filterdeleteconfirm'] = 'Вы действительно хотите удалить фильтр?';
$messages['filtersaved'] = 'Фильтр успешно сохранён';
$messages['filtersaveerror'] = 'Невозможно сохранить фильтр. Ошибка сервера';
$messages['ruledeleteconfirm'] = 'Вы уверенны, что хотите удалить это правило?';

@ -42,7 +42,7 @@ $messages['filterunknownerror'] = 'Prišlo je do neznane napake.';
$messages['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
$messages['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
$messages['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
$messages['filterconfirmdelete'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
$messages['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
$messages['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
$messages['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
$messages['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';

@ -43,7 +43,7 @@ $messages['filterunknownerror'] = 'Okänt serverfel';
$messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
$messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
$messages['filterdeleted'] = 'Filtret är borttaget';
$messages['filterconfirmdelete'] = 'Vill du ta bort det markerade filtret?';
$messages['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
$messages['filtersaved'] = 'Filtret har sparats';
$messages['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
$messages['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';

@ -43,7 +43,7 @@ $messages['filterunknownerror'] = 'Невідома помилка сервер
$messages['filterconnerror'] = 'Неможливо з\'єднатися з сервером.';
$messages['filterdeleteerror'] = 'Неможливо видалити фільтр. Помилка сервера.';
$messages['filterdeleted'] = 'Фільтр успішно видалено.';
$messages['filterconfirmdelete'] = 'Ви дійсно хочете видалити вибраний фільтр?';
$messages['filterdeleteconfirm'] = 'Ви дійсно хочете видалити вибраний фільтр?';
$messages['filtersaved'] = 'Фільтр успішно збережено.';
$messages['filtersaveerror'] = 'Неможливо зберегти фільтр. Помилка сервера.';
$messages['ruledeleteconfirm'] = 'Ви дійсно хочете видалити вибране правило?';

@ -38,7 +38,7 @@ $messages['filterunknownerror'] = '未知的服务器错误';
$messages['filterconnerror'] = '无法连接到 managesieve 服务器';
$messages['filterdeleteerror'] = '无法删除过滤器。服务器错误';
$messages['filterdeleted'] = '过滤器已成功删除';
$messages['filterconfirmdelete'] = '您确定要删除所选择的过滤器吗?';
$messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗?';
$messages['filtersaved'] = '过滤器已成功保存。';
$messages['filtersaveerror'] = '无法保存过滤器。服务器错误';
$messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗?';

@ -19,16 +19,25 @@ if (window.rcmail) {
rcmail.register_command('plugin.managesieve-del', function() { rcmail.managesieve_del() }, true);
rcmail.register_command('plugin.managesieve-up', function() { rcmail.managesieve_up() }, true);
rcmail.register_command('plugin.managesieve-down', function() { rcmail.managesieve_down() }, true);
rcmail.register_command('plugin.managesieve-set', function() { rcmail.managesieve_set() }, true);
rcmail.register_command('plugin.managesieve-setadd', function() { rcmail.managesieve_setadd() }, true);
rcmail.register_command('plugin.managesieve-setdel', function() { rcmail.managesieve_setdel() }, true);
rcmail.register_command('plugin.managesieve-setact', function() { rcmail.managesieve_setact() }, true);
if (rcmail.env.action == 'plugin.managesieve')
{
if (rcmail.gui_objects.sieveform)
rcmail.enable_command('plugin.managesieve-save', true);
else {
rcmail.enable_command('plugin.managesieve-del', 'plugin.managesieve-up', 'plugin.managesieve-down', false);
rcmail.enable_command('plugin.managesieve-add', !rcmail.env.sieveconnerror);
rcmail.enable_command('plugin.managesieve-del', 'plugin.managesieve-up',
'plugin.managesieve-down', false);
rcmail.enable_command('plugin.managesieve-add', 'plugin.managesieve-setadd', !rcmail.env.sieveconnerror);
rcmail.enable_command('plugin.managesieve-set', rcmail.gui_objects.filtersetslist != null);
rcmail.enable_command('plugin.managesieve-setact',
(rcmail.gui_objects.filtersetslist && rcmail.gui_objects.filtersetslist.value != rcmail.env.active_set));
rcmail.enable_command('plugin.managesieve-setdel',
(rcmail.gui_objects.filtersetslist && rcmail.gui_objects.filtersetslist.length > 1));
}
if (rcmail.gui_objects.filterslist) {
var p = rcmail;
rcmail.filters_list = new rcube_list_widget(rcmail.gui_objects.filterslist, {multiselect:false, draggable:false, keyboard:false});
@ -53,7 +62,7 @@ if (window.rcmail) {
{
var id = this.filters_list.get_single_selection();
if (confirm(this.get_label('managesieve.filterconfirmdelete')))
if (confirm(this.get_label('managesieve.filterdeleteconfirm')))
this.http_request('plugin.managesieve',
'_act=delete&_fid='+this.filters_list.rows[id].uid, true);
};
@ -203,7 +212,7 @@ if (window.rcmail) {
rcube_webmail.prototype.managesieve_save = function()
{
if (parent.rcmail && parent.rcmail.filters_list)
if (parent.rcmail && parent.rcmail.filters_list && this.gui_objects.sieveform.name != 'filtersetform')
{
var id = parent.rcmail.filters_list.get_single_selection();
if (id != null)
@ -378,4 +387,75 @@ if (window.rcmail) {
}
}
}
// Set change
rcube_webmail.prototype.managesieve_set = function()
{
var script = $(this.gui_objects.filtersetslist).val();
location.href = this.env.comm_path+'&_action=plugin.managesieve&_sid='+script;
};
// Set activate
rcube_webmail.prototype.managesieve_setact = function()
{
if (!this.gui_objects.filtersetslist)
return false;
var script = this.gui_objects.filtersetslist.value;
this.http_post('plugin.managesieve', '_act=setact&_set='+script);
};
// Set activate flag in sets list after set activation
rcube_webmail.prototype.managesieve_reset = function(name)
{
if (!this.gui_objects.filtersetslist || !name)
return false;
var opts = this.gui_objects.filtersetslist.getElementsByTagName('option');
var regx = new RegExp(RegExp.escape(' (' + this.get_label('managesieve.active') + ')'));
for (var x=1; x<opts.length; x++)
if (opts[x].value != name && opts[x].innerHTML.match(regx))
opts[x].innerHTML = opts[x].innerHTML.replace(regx, '');
else if (opts[x].value == name)
opts[x].innerHTML = opts[x].innerHTML + ' (' + this.get_label('managesieve.active') + ')';
};
// Set delete
rcube_webmail.prototype.managesieve_setdel = function()
{
if (!this.gui_objects.filtersetslist)
return false;
if (!confirm(this.get_label('managesieve.setdeleteconfirm')))
return false;
var script = this.gui_objects.filtersetslist.value;
this.http_post('plugin.managesieve', '_act=setdel&_set='+script);
};
// Set add
rcube_webmail.prototype.managesieve_setadd = function()
{
this.filters_list.clear_selection();
this.enable_command('plugin.managesieve-up', 'plugin.managesieve-down', 'plugin.managesieve-del', false);
if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
{
target = window.frames[this.env.contentframe];
this.set_busy(true, 'loading');
target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1&_newset=1';
}
};
rcube_webmail.prototype.managesieve_reload = function(set)
{
this.env.reload_set = set;
window.setTimeout(function() {
location.href = rcmail.env.comm_path + '&_action=plugin.managesieve'
+ (rcmail.env.reload_set ? '&_sid=' + rcmail.env.reload_set : '')
}, 500);
};
}

@ -7,7 +7,7 @@
* It's clickable interface which operates on text scripts and communicates
* with server using managesieve protocol. Adds Filters tab in Settings.
*
* @version 1.7
* @version 2.0
* @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
*
* Configuration (see config.inc.php.dist):
@ -35,7 +35,7 @@ class managesieve extends rcube_plugin
$this->add_texts('localization/', array('filters','managefilters'));
// register actions
$this->register_action('plugin.managesieve', array($this, 'managesieve_init'));
$this->register_action('plugin.managesieve', array($this, 'managesieve_actions'));
$this->register_action('plugin.managesieve-save', array($this, 'managesieve_save'));
// include main js script
@ -52,8 +52,10 @@ class managesieve extends rcube_plugin
// register UI objects
$this->rc->output->add_handlers(array(
'filterslist' => array($this, 'filters_list'),
'filtersetslist' => array($this, 'filtersets_list'),
'filterframe' => array($this, 'filter_frame'),
'filterform' => array($this, 'filter_form'),
'filtersetform' => array($this, 'filterset_form'),
));
require_once($this->home . '/lib/Net/Sieve.php');
@ -65,23 +67,51 @@ class managesieve extends rcube_plugin
str_replace('%h', $_SESSION['imap_host'], $this->rc->config->get('managesieve_host', 'localhost')),
$this->rc->config->get('managesieve_port', 2000),
$this->rc->config->get('managesieve_usetls', false),
$this->rc->config->get('managesieve_disabled_extensions'));
$this->rc->config->get('managesieve_disabled_extensions'),
$this->rc->config->get('managesieve_debug', false)
);
$error = $this->sieve->error();
if (!($error = $this->sieve->error())) {
$list = $this->sieve->get_scripts();
$active = $this->sieve->get_active();
$_SESSION['managesieve_active'] = $active;
if (!empty($_GET['_sid'])) {
$script_name = get_input_value('_sid', RCUBE_INPUT_GET);
} else if (!empty($_SESSION['managesieve_current'])) {
$script_name = $_SESSION['managesieve_current'];
} else {
// get active script
if ($active) {
$script_name = $active;
} else if ($list) {
$script_name = $list[0];
// create a new (initial) script
} else {
// if script not exists build default script contents
$script_file = $this->rc->config->get('managesieve_default');
$script_name = 'roundcube';
if ($script_file && is_readable($script_file))
$content = file_get_contents($script_file);
// add script and set it active
if ($this->sieve->save_script($script_name, $content))
if ($this->sieve->activate($script_name))
$_SESSION['managesieve_active'] = $script_name;
}
}
if ($error == SIEVE_ERROR_NOT_EXISTS)
{
// if script not exists build default script contents
$script_file = $this->rc->config->get('managesieve_default');
if ($script_file && is_readable($script_file))
$this->sieve->script->add_text(file_get_contents($script_file));
// that's not exactly an error
$error = false;
if ($script_name)
$this->sieve->load($script_name);
$error = $this->sieve->error();
}
elseif ($error)
// finally set script objects
if ($error)
{
switch ($error)
{
switch ($error) {
case SIEVE_ERROR_CONNECTION:
case SIEVE_ERROR_LOGIN:
$this->rc->output->show_message('managesieve.filterconnerror', 'error');
@ -90,26 +120,22 @@ class managesieve extends rcube_plugin
$this->rc->output->show_message('managesieve.filterunknownerror', 'error');
break;
}
// to disable 'Add filter' button set env variable
$this->rc->output->set_env('filterconnerror', true);
}
// finally set script objects
if ($error)
{
$this->script = array();
}
else
{
$this->script = $this->sieve->script->as_array();
$this->exts = $this->sieve->get_extensions();
$this->rc->output->set_env('active_set', $_SESSION['managesieve_active']);
$_SESSION['managesieve_current'] = $this->sieve->current;
}
return $error;
}
function managesieve_init()
function managesieve_actions()
{
// Init plugin and handle managesieve connection
$error = $this->managesieve_start();
@ -134,7 +160,7 @@ class managesieve extends rcube_plugin
$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
}
}
elseif ($action=='down' && !$error)
else if ($action=='down' && !$error)
{
if (isset($this->script[$fid]) && isset($this->script[$fid+1]))
{
@ -142,27 +168,56 @@ class managesieve extends rcube_plugin
&& $this->sieve->script->update_rule($fid+1, $this->script[$fid]) !== false)
$result = $this->sieve->save();
if ($result) {
if ($result === true) {
// $this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
$this->rc->output->command('managesieve_updatelist', 'down', '', $fid);
} else
} else {
$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
}
}
}
}
elseif ($action=='delete' && !$error)
else if ($action=='delete' && !$error)
{
if (isset($this->script[$fid]))
{
if ($this->sieve->script->delete_rule($fid))
$result = $this->sieve->save();
if (!$result)
$this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
else {
if ($result === true) {
$this->rc->output->show_message('managesieve.filterdeleted', 'confirmation');
$this->rc->output->command('managesieve_updatelist', 'delete', '', $fid);
} else {
$this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
}
}
}
}
else if ($action=='setact' && !$error)
{
$script_name = get_input_value('_set', RCUBE_INPUT_GPC);
$result = $this->sieve->activate($script_name);
if ($result === true) {
$this->rc->output->set_env('active_set', $script_name);
$this->rc->output->show_message('managesieve.setactivated', 'confirmation');
$this->rc->output->command('enable_command', 'plugin.managesieve-setact', false);
$this->rc->output->command('managesieve_reset', $script_name);
$_SESSION['managesieve_active'] = $script_name;
} else {
$this->rc->output->show_message('managesieve.setactivateerror', 'error');
}
}
else if ($action=='setdel' && !$error)
{
$script_name = get_input_value('_set', RCUBE_INPUT_GPC);
$result = $this->sieve->remove($script_name);
if ($result === true) {
$this->rc->output->show_message('managesieve.setdeleted', 'confirmation');
$this->rc->output->command('managesieve_reload');
rcube_sess_unset('managesieve_current');
} else {
$this->rc->output->show_message('managesieve.setdeleteerror', 'error');
}
}
elseif ($action=='ruleadd')
{
@ -192,8 +247,29 @@ class managesieve extends rcube_plugin
// Init plugin and handle managesieve connection
$error = $this->managesieve_start();
// add/edit action
if (isset($_POST['_name']))
// filters set add action
if (!empty($_POST['_newset']))
{
$name = get_input_value('_name', RCUBE_INPUT_GPC);
$copy = get_input_value('_copy', RCUBE_INPUT_GPC);
if (!$name)
$error = 'managesieve.emptyname';
else if (mb_strlen($name)>128)
$error = 'managesieve.nametoolong';
else if (!$this->sieve->copy($name, $copy))
$error = 'managesieve.setcreateerror';
if (!$error) {
$this->rc->output->show_message('managesieve.setcreated', 'confirmation');
$this->rc->output->command('parent.managesieve_reload', $name);
// rcube_sess_unset('managesieve_current');
} else {
$this->rc->output->show_message($error, 'error');
}
}
// filter add/edit action
else if (isset($_POST['_name']))
{
$name = trim(get_input_value('_name', RCUBE_INPUT_POST));
$fid = trim(get_input_value('_fid', RCUBE_INPUT_POST));
@ -422,9 +498,12 @@ class managesieve extends rcube_plugin
private function managesieve_send()
{
// Handle form action
if (isset($_GET['_framed']) || isset($_POST['_framed']))
$this->rc->output->send('managesieve.managesieveedit');
else {
if (isset($_GET['_framed']) || isset($_POST['_framed'])) {
if (isset($_GET['_newset']) || isset($_POST['_newset']))
$this->rc->output->send('managesieve.setedit');
else
$this->rc->output->send('managesieve.filteredit');
} else {
$this->rc->output->set_pagetitle($this->gettext('filters'));
$this->rc->output->send('managesieve.managesieve');
}
@ -451,7 +530,34 @@ class managesieve extends rcube_plugin
$this->rc->output->include_script('list.js');
// add some labels to client
$this->rc->output->add_label('managesieve.filterconfirmdelete');
$this->rc->output->add_label('managesieve.filterdeleteconfirm');
return $out;
}
// return the filters list as <SELECT>
function filtersets_list($attrib)
{
// add id to message list table if not specified
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmfiltersetslist';
$list = $this->sieve->get_scripts();
$active = $this->sieve->get_active();
$select = new html_select(array('name' => '_set', 'id' => $attrib['id'], 'onchange' => 'rcmail.managesieve_set()'));
asort($list, SORT_LOCALE_STRING);
foreach($list as $set)
$select->add($set . ($set == $active ? ' ('.$this->gettext('active').')' : ''), $set);
$out = $select->show($this->sieve->current);
// set client env
$this->rc->output->add_gui_object('filtersetslist', $attrib['id']);
$this->rc->output->add_label('managesieve.setdeleteconfirm');
$this->rc->output->add_label('managesieve.active');
return $out;
}
@ -465,12 +571,61 @@ class managesieve extends rcube_plugin
$this->rc->output->set_env('contentframe', $attrib['name']);
$this->rc->output->set_env('blankpage', $attrib['src'] ?
$this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
$this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
return html::tag('iframe', $attrib);
}
function filterset_form($attrib)
{
if (!$attrib['id'])
$attrib['id'] = 'rcmfiltersetform';
$out = '<form name="filtersetform" action="./" method="post">'."\n";
$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
$hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
$hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
$hiddenfields->add(array('name' => '_newset', 'value' => 1));
$out .= $hiddenfields->show();
$name = get_input_value('_name', RCUBE_INPUT_GPC);
$copy = get_input_value('_copy', RCUBE_INPUT_GPC);
$table = new html_table(array('cols' => 2));
// filter set name input
$input_name = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30,
'class' => ($this->errors['name'] ? 'error' : '')));
$table->add('title', sprintf('<label for="%s"><b>%s:</b></label>', '_name', Q($this->gettext('filtersetname'))));
$table->add(null, $input_name->show($name));
// filters set list
$list = $this->sieve->get_scripts();
$active = $this->sieve->get_active();
$select = new html_select(array('name' => '_copy', 'id' => '_copy'));
asort($list, SORT_LOCALE_STRING);
$select->add($this->gettext('none'), '');
foreach($list as $set)
$select->add($set . ($set == $active ? ' ('.$this->gettext('active').')' : ''), $set);
$table->add('title', '<label>'.$this->gettext('copyfromset').':</label>');
$table->add(null, $select->show($copy));
$out .= $table->show();
$this->rc->output->add_gui_object('sieveform', 'filtersetform');
return $out;
}
function filter_form($attrib)
{
if (!$attrib['id'])
@ -818,7 +973,7 @@ class managesieve extends rcube_plugin
private function check_email($email)
{
if (function_exists('check_email'));
if (function_exists('check_email'));
return check_email($email);
// Check for invalid characters

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

@ -6,7 +6,7 @@
position: absolute;
left: 20px;
width: 220px;
top: 130px;
top: 120px;
bottom: 30px;
border: 1px solid #999999;
background-color: #F9F9F9;
@ -32,13 +32,113 @@
{
position: absolute;
left: 20px;
top: 95px;
top: 85px;
}
#filtersetsbuttons
{
position: absolute;
left: 250px;
top: 85px;
}
#filtersbuttons a,
#filtersetsbuttons a
{
display: block;
float: left;
}
#filtersbuttons a.button,
#filtersbuttons a.buttonPas,
#filtersetsbuttons a.button,
#filtersetsbuttons a.buttonPas
{
display: block;
float: left;
width: 32px;
height: 32px;
padding: 0;
margin-right: 3px;
overflow: hidden;
background: url('managesieve_toolbar.png') 0 0 no-repeat transparent;
opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
}
#filtersbuttons a.buttonPas,
#filtersetsbuttons a.buttonPas
{
filter: alpha(opacity=35);
opacity: 0.35;
}
#filtersbuttons a.add {
background-position: 0px 0px;
}
#filtersbuttons a.addsel {
background-position: 0 -32px;
}
#filtersbuttons a.del {
background-position: -32px 0px;
}
#filtersbuttons a.delsel {
background-position: -32px -32px;
}
#filtersbuttons a.up {
background-position: -64px 0px;
}
#filtersbuttons a.upsel {
background-position: -64px -32px;
}
#filtersbuttons a.down {
background-position: -96px 0px;
}
#filtersbuttons a.downsel {
background-position: -96px -32px;
}
#filtersetsbuttons a.setadd {
background-position: -128px 0px;
}
#filtersetsbuttons a.setaddsel {
background-position: -128px -32px;
}
#filtersetsbuttons a.setdel {
background-position: -160px 0px;
}
#filtersetsbuttons a.setdelsel {
background-position: -160px -32px;
}
#filtersetsbuttons a.setset {
background-position: -192px 0px;
}
#filtersetsbuttons a.setsetsel {
background-position: -192px -32px;
}
#filtersetselect
{
position: absolute;
left: 380px;
top: 90px;
}
#filter-box
{
position: absolute;
top: 95px;
top: 120px;
left: 250px;
right: 20px;
bottom: 30px;
@ -46,7 +146,7 @@
overflow: hidden;
/* css hack for IE */
width: expression((parseInt(document.documentElement.clientWidth)-30-parseInt(document.getElementById('filterslist').offsetLeft)-parseInt(document.getElementById('filterslist').offsetWidth))+'px');
height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
}
#filter-frame

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

@ -94,6 +94,8 @@ function rule_join_radio(value)
}
</script>
<div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.filterdef" /></div>
<div id="filter-form">
<roundcube:object name="filterform" />

@ -13,10 +13,20 @@
<roundcube:include file="/includes/settingstabs.html" />
<div id="filtersbuttons">
<roundcube:button command="plugin.managesieve-add" imageSel="/this/filter_add_sel.png" imagePas="/this/filter_add_pas.png" imageAct="/this/filter_add_act.png" width="32" height="32" title="managesieve.filteradd" />
<roundcube:button command="plugin.managesieve-del" imageSel="/this/filter_del_sel.png" imagePas="/this/filter_del_pas.png" imageAct="/this/filter_del_act.png" width="32" height="32" title="managesieve.filterdel" />
<roundcube:button command="plugin.managesieve-up" imageSel="/this/filter_up_sel.png" imagePas="/this/filter_up_pas.png" imageAct="/this/filter_up_act.png" width="32" height="32" title="managesieve.moveup" />
<roundcube:button command="plugin.managesieve-down" imageSel="/this/filter_down_sel.png" imagePas="/this/filter_down_pas.png" imageAct="/this/filter_down_act.png" width="32" height="32" title="managesieve.movedown" />
<roundcube:button command="plugin.managesieve-add" type="link" class="buttonPas add" classSel="button addsel" classAct="button add" title="managesieve.filteradd" content=" " />
<roundcube:button command="plugin.managesieve-del" type="link" class="buttonPas del" classSel="button delsel" classAct="button del" title="managesieve.filterdel" content=" " />
<roundcube:button command="plugin.managesieve-up" type="link" class="buttonPas up" classSel="button upsel" classAct="button up" title="managesieve.moveup" content=" " />
<roundcube:button command="plugin.managesieve-down" type="link" class="buttonPas down" classSel="button downsel" classAct="button down" title="managesieve.movedown" content=" " />
</div>
<div id="filtersetsbuttons">
<roundcube:button command="plugin.managesieve-setadd" type="link" class="buttonPas setadd" classSel="button setaddsel" classAct="button setadd" title="managesieve.filtersetadd" content=" " />
<roundcube:button command="plugin.managesieve-setdel" type="link" class="buttonPas setdel" classSel="button setdelsel" classAct="button setdel" title="managesieve.filtersetdel" content=" " />
<roundcube:button command="plugin.managesieve-setact" type="link" class="buttonPas setset" classSel="button setsetsel" classAct="button setset" title="managesieve.filtersetact" content=" " />
</div>
<div id="filtersetselect">
<roundcube:label name="managesieve.filterset" />:
<roundcube:object name="filtersetslist" id="filtersets-select" />
</div>
<div id="filterslist">

@ -0,0 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
</head>
<body class="iframe">
<div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.newfilterset" /></div>
<div id="filter-form">
<roundcube:object name="filtersetform" />
<p>
<roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
</p>
</form>
</div>
</body>
</html>
Loading…
Cancel
Save