[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c... |
|
Date: |
Thu, 22 Feb 2007 10:43:10 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 07/02/22 10:43:10
Modified files:
inc : class.bofelamimail.inc.php
class.bofilter.inc.php class.sofilter.inc.php
class.uifilter.inc.php
templates/base : filterForm.tpl
Log message:
notices, fix for delete filter
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofilter.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.sofilter.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifilter.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/filterForm.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: inc/class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- inc/class.bofelamimail.inc.php 21 Feb 2007 18:23:03 -0000 1.18
+++ inc/class.bofelamimail.inc.php 22 Feb 2007 10:43:09 -0000 1.19
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofelamimail.inc.php,v 1.18 2007/02/21 18:23:03 sigurdne
Exp $ */
+ /* $Id: class.bofelamimail.inc.php,v 1.19 2007/02/22 10:43:09 sigurdne
Exp $ */
class bofelamimail
{
@@ -903,6 +903,7 @@
$deleteOptions =
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["deleteOptions"];
reset($_messageUID);
+ $msglist = '';
while(list($key, $value) = each($_messageUID))
{
if(!empty($msglist)) $msglist .= ",";
Index: inc/class.bofilter.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofilter.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.bofilter.inc.php 18 Dec 2006 20:03:32 -0000 1.4
+++ inc/class.bofilter.inc.php 22 Feb 2007 10:43:09 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofilter.inc.php,v 1.4 2006/12/18 20:03:32 sigurdne Exp $
*/
+ /* $Id: class.bofilter.inc.php,v 1.5 2007/02/22 10:43:09 sigurdne Exp $
*/
class bofilter
{
@@ -46,6 +46,7 @@
function deleteFilter($_filterID)
{
unset($this->sessionData['filter'][$_filterID]);
+
$this->sofilter->saveFilter($this->sessionData['filter']);
$this->saveSessionData();
}
@@ -107,7 +108,7 @@
$data['to'] = $_formData['to'];
if(!empty($_formData['subject']))
$data['subject']= $_formData['subject'];
- if($_formData['filterActive'] == "true")
+ if(isset($_formData['filterActive']) &&
$_formData['filterActive'] == "true")
{
$data['filterActive']= "true";
}
Index: inc/class.sofilter.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.sofilter.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.sofilter.inc.php 18 Dec 2006 20:28:00 -0000 1.2
+++ inc/class.sofilter.inc.php 22 Feb 2007 10:43:09 -0000 1.3
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.sofilter.inc.php,v 1.2 2006/12/18 20:28:00 sigurdne Exp $
*/
+ /* $Id: class.sofilter.inc.php,v 1.3 2007/02/22 10:43:09 sigurdne Exp $
*/
class sofilter
{
@@ -41,7 +41,7 @@
$this->accountid,$data);
$GLOBALS['phpgw']->db->query($query);
- unset($this->sessionData['filter'][$_filterID]);
+ // unset($this->sessionData['filter'][$_filterID]);
//$_filterID is not defined
}
function restoreFilter()
Index: inc/class.uifilter.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifilter.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.uifilter.inc.php 20 Dec 2006 13:56:26 -0000 1.5
+++ inc/class.uifilter.inc.php 22 Feb 2007 10:43:09 -0000 1.6
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifilter.inc.php,v 1.5 2006/12/20 13:56:26 sigurdne Exp $
*/
+ /* $Id: class.uifilter.inc.php,v 1.6 2007/02/22 10:43:09 sigurdne Exp $
*/
class uifilter
{
@@ -100,12 +100,12 @@
}
break;
case "updateFilter":
- $filterID =
$GLOBALS['HTTP_GET_VARS']['filterID'];
+ $filterID =
isset($GLOBALS['HTTP_GET_VARS']['filterID'])?$GLOBALS['HTTP_GET_VARS']['filterID']:'';
$formData['from'] =
$GLOBALS['HTTP_POST_VARS']['from'];
$formData['to'] =
$GLOBALS['HTTP_POST_VARS']['to'];
$formData['subject'] =
$GLOBALS['HTTP_POST_VARS']['subject'];
$formData['filterName'] =
$GLOBALS['HTTP_POST_VARS']['filterName'];
-
if($GLOBALS['HTTP_POST_VARS']['filter_active'] == "on")
+
if(isset($GLOBALS['HTTP_POST_VARS']['filter_active']) &&
$GLOBALS['HTTP_POST_VARS']['filter_active'] == "on")
{
$formData['filterActive']
= "true";
}
@@ -120,11 +120,11 @@
);
$this->t->set_var('link_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
$this->t->set_var("filterName",$filterList[$filterID]['filterName']);
-
$this->t->set_var("from",$filterList[$filterID]['from']);
-
$this->t->set_var("to",$filterList[$filterID]['to']);
-
$this->t->set_var("subject",$filterList[$filterID]['subject']);
-
if($filterList[$filterID]['filterActive'] == "true")
+
$this->t->set_var("filterName",isset($filterList[$filterID]['filterName'])?$filterList[$filterID]['filterName']:'');
+
$this->t->set_var("from",isset($filterList[$filterID]['from'])?$filterList[$filterID]['from']:'');
+
$this->t->set_var("to",isset($filterList[$filterID]['to'])?$filterList[$filterID]['to']:'');
+
$this->t->set_var("subject",isset($filterList[$filterID]['subject'])?$filterList[$filterID]['subject']:'');
+
if(isset($filterList[$filterID]['filterActive']) &&
$filterList[$filterID]['filterActive'] == "true")
{
$this->t->set_var("filter_checked","checked");
}
@@ -218,6 +218,7 @@
$this->t->set_var("lang_new_filter",lang('new filter'));
$this->t->set_var("lang_no_filter",lang('no filter'));
$this->t->set_var("lang_activate",lang('activate'));
+ $this->t->set_var("lang_add",lang('add'));
$this->t->set_var("bg01",$GLOBALS['phpgw_info']["theme"]["bg01"]);
$this->t->set_var("bg02",$GLOBALS['phpgw_info']["theme"]["bg02"]);
Index: templates/base/filterForm.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/filterForm.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/filterForm.tpl 20 Dec 2006 13:56:26 -0000 1.3
+++ templates/base/filterForm.tpl 22 Feb 2007 10:43:10 -0000 1.4
@@ -60,7 +60,7 @@
<a href="{link_newFilter} ">{lang_new_filter}</a>
</td>
<td class="body" align="right" colspan="2">
- <input type="submit" class="body" value="Speichern">
+ <input type="submit" class="body" value='{lang_add}'>
</td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c...,
Sigurd Nes <=