summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee0b60c)
raw | patch | inline | side by side (parent: ee0b60c)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 6 Sep 2010 11:56:17 +0000 (11:56 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 6 Sep 2010 11:56:17 +0000 (11:56 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19524 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc
index 3474ed0244c7a003b6faef900063718e93ca83c7..31ae41c39ae9a7d45a9e0ada3d569624c299d24c 100644 (file)
function execute()
{
+
+ $this->filter = array();
+ $this->filter[] = array (
+ 'TYPE' => 'AND',
+ 'NAME' => 'MuellRaus',
+ 'DESC' => 'Spam loeschen',
+ 'CONDITIONS' => array (
+ array('FIELD' => 'from',
+ 'COMPARATOR' => 'equals',
+ 'MATCH' => 'herbert'),
+ array('FIELD' => 'subject',
+ 'COMPARATOR' => 'contains',
+ 'MATCH' => 'advertising'),
+ ),
+ 'ACTION' => array (
+ array('ACTION'=>'MARK',
+ 'VALUE' => 'SPAM'),
+ array('ACTION'=>'MOVE',
+ 'VALUE' => 'gosa+shared/hickert/trash')
+ )
+ );
+
+ $this->filter[] = array (
+ 'TYPE' => 'OR',
+ 'NAME' => 'Kunden',
+ 'DESC' => 'Kunden Mails in Wichtig schieben',
+ 'CONDITIONS' => array (
+ array('FIELD' => 'from',
+ 'COMPARATOR' => 'contains',
+ 'MATCH' => 'gonicus'),
+ array('FIELD' => 'from',
+ 'COMPARATOR' => 'contains',
+ 'MATCH' => 'lka'),
+ ),
+ 'ACTION' => array (
+ array('ACTION'=>'MARK',
+ 'VALUE' => 'HAM'),
+ array('ACTION'=>'MOVE',
+ 'VALUE' => 'gosa+shared/hickert/wichtig')
+ )
+ );
+
+
$smarty = get_smarty();
diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index fa70d041e9ea030a0717f71c2235ba30c2ce04ca..a4c50e91aad3890d0ed2622b0f0642a538aa71fd 100644 (file)
}
}
+ // TODO: Detect if we've a valid groupware account here.
+ $this->is_account = FALSE;
+
// Set vacation start/stop if not set alreasy
$this->vacationStart = time();
$this->vacationStop = time() + (14 * 60*60*24);
diff --git a/gosa-plugins/groupware/personal/groupware/filterEditor.tpl b/gosa-plugins/groupware/personal/groupware/filterEditor.tpl
index 338e0f91093fa77e1fb0edfe3a258fd7269c096d..8c528f1fbd662c6b9327a4b2018d9b356c7e4b2a 100644 (file)
<h3>{t}Available filter rules {/t}</h3>
{$list}
+<select name='filterTemplate' size=1>
+ <option>Mails von bestimmten Sendern in einen Ordner verschieben</option>
+ <option>Mails von bekannten Sender (Adressbuch) in Ordner verschieben</option>
+ <option>Mails löschen (Alle und immer!)</option>
+ <option>Bla</option>
+ <option>Manuelle Regel</option>
+</select>
+<button name='addFilter'>{msgPool type='addButton'}</button>
+
<hr>
<div class="plugin-actions">