[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: felamimail/inc class.bofelamimail.inc.php,1.2.2.
|
From: |
Lars Kneschke <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: felamimail/inc class.bofelamimail.inc.php,1.2.2.5,1.2.2.6 class.socaching.inc.php,1.1.1.1.2.3,1.1.1.1.2.4 class.uifelamimail.inc.php,1.2.2.5,1.2.2.6 class.uifilter.inc.php,1.1.2.1,1.1.2.2 |
|
Date: |
Thu, 20 Jun 2002 08:46:30 -0400 |
Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv12276/inc
Modified Files:
Tag: Version-0_9_14-branch
class.bofelamimail.inc.php class.socaching.inc.php
class.uifelamimail.inc.php class.uifilter.inc.php
Log Message:
improved the search interface
- you search now also for the to field
- you can easily enable/disable the filter
modified the way the buttons(mark read, mark unread, ...) work in linux-at-work
template
added translations
fixed some minor bugs with message display
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -r1.2.2.5 -r1.2.2.6
*** class.bofelamimail.inc.php 4 Jun 2002 12:15:23 -0000 1.2.2.5
--- class.bofelamimail.inc.php 20 Jun 2002 12:46:27 -0000 1.2.2.6
***************
*** 195,198 ****
--- 195,199 ----
case "unread":
$result = imap_clearflag_full
($this->mbox, $msglist, "\\Seen", ST_UID);
+ $result = imap_clearflag_full
($this->mbox, $msglist, "\\Answered", ST_UID);
break;
}
***************
*** 617,622 ****
--- 618,629 ----
if(!empty($_formData['from']))
$data['from'] = $_formData['from'];
+ if(!empty($_formData['to']))
+ $data['to'] = $_formData['to'];
if(!empty($_formData['subject']))
$data['subject']= $_formData['subject'];
+ if($_formData['filterActive'] == "true")
+ {
+ $data['filterActive']= "true";
+ }
$this->sessionData['filter'] = $data;
***************
*** 626,629 ****
--- 633,649 ----
{
$GLOBALS['phpgw']->session->appsession('session_data','',$this->sessionData);
+ }
+
+ function toggleFilter()
+ {
+ if($this->sessionData['filter']['filterActive'] ==
'true')
+ {
+ $this->sessionData['filter']['filterActive'] =
'false';
+ }
+ else
+ {
+ $this->sessionData['filter']['filterActive'] =
'true';
+ }
+ $this->saveSessionData();
}
}
Index: class.socaching.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.socaching.inc.php,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** class.socaching.inc.php 4 Jun 2002 12:15:23 -0000 1.1.1.1.2.3
--- class.socaching.inc.php 20 Jun 2002 12:46:27 -0000 1.1.1.1.2.4
***************
*** 74,87 ****
}
! while(list($key,$value) = @each($_filter))
{
! switch($key)
{
! case "from":
! $filter .= " and (sender_name
like '%$value%' or sender_address like '%$value%') ";
! break;
! case "subject":
! $filter .= " and subject like
'%$value%' ";
! break;
}
}
--- 74,93 ----
}
! if($_filter['filterActive'] == "true")
{
! while(list($key,$value) = @each($_filter))
{
! switch($key)
! {
! case "from":
! $filter .= " and
(sender_name like '%$value%' or sender_address like '%$value%') ";
! break;
! case "to":
! $filter .= " and
(to_name like '%$value%' or to_address like '%$value%') ";
! break;
! case "subject":
! $filter .= " and
subject like '%$value%' ";
! break;
! }
}
}
***************
*** 156,169 ****
function getMessageCounter($_filter)
{
! while(list($key,$value) = @each($_filter))
{
! switch($key)
{
! case "from":
! $filter .= " and (sender_name
like '%$value%' or sender_address like '%$value%') ";
! break;
! case "subject":
! $filter .= " and subject like
'%$value%' ";
! break;
}
}
--- 162,181 ----
function getMessageCounter($_filter)
{
! if($_filter['filterActive'] == 'true')
{
! while(list($key,$value) = @each($_filter))
{
! switch($key)
! {
! case "from":
! $filter .= " and
(sender_name like '%$value%' or sender_address like '%$value%') ";
! break;
! case "to":
! $filter .= " and
(to_name like '%$value%' or to_address like '%$value%') ";
! break;
! case "subject":
! $filter .= " and
subject like '%$value%' ";
! break;
! }
}
}
Index: class.uifelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -r1.2.2.5 -r1.2.2.6
*** class.uifelamimail.inc.php 11 Jun 2002 19:10:00 -0000 1.2.2.5
--- class.uifelamimail.inc.php 20 Jun 2002 12:46:27 -0000 1.2.2.6
***************
*** 21,24 ****
--- 21,25 ----
'handleButtons' => True,
'deleteMessage' => True,
+ 'toggleFilter' => True,
'compressFolder' => True
);
***************
*** 44,54 ****
$GLOBALS['HTTP_POST_VARS']["mark_deleted"] =
"true";
if(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
$GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
!
!isset($GLOBALS['HTTP_POST_VARS']["mark_unread"]) &&
! !isset($GLOBALS['HTTP_POST_VARS']["mark_read"])
&&
!
!isset($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
!
!isset($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
!
!isset($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
{
if ($GLOBALS['HTTP_POST_VARS']["folderAction"]
== "changeFolder")
--- 45,56 ----
$GLOBALS['HTTP_POST_VARS']["mark_deleted"] =
"true";
+
if(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
$GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
!
empty($GLOBALS['HTTP_POST_VARS']["mark_unread"]) &&
! empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
&&
!
empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
!
empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
!
empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
{
if ($GLOBALS['HTTP_POST_VARS']["folderAction"]
== "changeFolder")
***************
*** 74,82 ****
elseif(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
$GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
!
isset($GLOBALS['HTTP_POST_VARS']["mark_unread"]) ||
! isset($GLOBALS['HTTP_POST_VARS']["mark_read"])
||
!
isset($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) ||
!
isset($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) ||
!
isset($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
{
$this->mailbox =
urldecode($GLOBALS['HTTP_POST_VARS']["mailbox"]);
--- 76,80 ----
elseif(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
$GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
!
!empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
{
$this->mailbox =
urldecode($GLOBALS['HTTP_POST_VARS']["mailbox"]);
***************
*** 84,87 ****
--- 82,111 ----
$this->sort = "6";
}
+ elseif(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
+ $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
+
!empty($GLOBALS['HTTP_POST_VARS']["mark_unread"]) ||
+ !empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
||
+
!empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) ||
+
!empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"]))
+ {
+ $this->mailbox =
urldecode($GLOBALS['HTTP_POST_VARS']["mailbox"]);
+ if ($GLOBALS['HTTP_GET_VARS']["startMessage"])
+ {
+ $this->startMessage =
$GLOBALS['HTTP_GET_VARS']["startMessage"];
+ }
+ else
+ {
+ $this->startMessage = "1";
+ }
+
+ if (isset($GLOBALS['HTTP_GET_VARS']["sort"]))
+ {
+ $this->sort =
$GLOBALS['HTTP_GET_VARS']["sort"];
+ }
+ else
+ {
+ $this->sort = "6";
+ }
+ }
else
{
***************
*** 161,165 ****
}
!
elseif(isset($GLOBALS['HTTP_POST_VARS']["mark_deleted"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
--- 185,189 ----
}
!
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
***************
*** 167,171 ****
}
! elseif(isset($GLOBALS['HTTP_POST_VARS']["mark_unread"])
&&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
--- 191,195 ----
}
!
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_unread"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
***************
*** 173,177 ****
}
! elseif(isset($GLOBALS['HTTP_POST_VARS']["mark_read"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
--- 197,201 ----
}
! elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
&&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
***************
*** 179,183 ****
}
!
elseif(isset($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
--- 203,207 ----
}
!
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
***************
*** 185,189 ****
}
!
elseif(isset($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
--- 209,213 ----
}
!
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
***************
*** 218,224 ****
--- 242,250 ----
$this->t->set_block('body','header_row_ADS');
$this->t->set_block('body','header_row_F');
+ $this->t->set_block('body','header_row_FA');
$this->t->set_block('body','header_row_FS');
$this->t->set_block('body','header_row_FAS');
$this->t->set_block('body','header_row_R');
+ $this->t->set_block('body','header_row_RS');
$this->t->set_block('body','header_row_D');
$this->t->set_block('body','header_row_DS');
***************
*** 259,263 ****
);
$this->t->set_var('url_sort_subject',$GLOBALS['phpgw']->link('/index.php',$linkData));
!
// create the urls for sorting
switch($this->sort)
--- 285,299 ----
);
$this->t->set_var('url_sort_subject',$GLOBALS['phpgw']->link('/index.php',$linkData));
!
! $filter = $this->bofelamimail->sessionData['filter'];
! if($filter['filterActive'] == "true")
! {
!
$this->t->set_var('lang_status_filter',lang('deactivate filter'));
! }
! else
! {
!
$this->t->set_var('lang_status_filter',lang('activate filter'));
! }
!
// create the urls for sorting
switch($this->sort)
***************
*** 552,555 ****
--- 588,600 ----
$linkData = array
(
+ 'menuaction' =>
'felamimail.uifelamimail.toggleFilter',
+ 'mailbox' => $urlMailbox,
+ 'startMessage' => $this->startMessage,
+ 'sort' => $this->sort,
+ );
+
$this->t->set_var('url_status_filter',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
+ $linkData = array
+ (
'menuaction' =>
'felamimail.uifilter.mainScreen',
'mailbox' => $urlMailbox,
***************
*** 561,567 ****
$linkData = array
(
! 'menuaction' =>
'felamimail.uifelamimail.handleButtons'
);
$this->t->set_var('url_change_folder',$GLOBALS['phpgw']->link('/index.php',$linkData));
$this->t->parse("out","main");
--- 606,617 ----
$linkData = array
(
! 'menuaction' =>
'felamimail.uifelamimail.handleButtons',
! 'mailbox' => $urlMailbox,
! 'startMessage' => $this->startMessage,
! 'sort' => $this->sort,
);
$this->t->set_var('url_change_folder',$GLOBALS['phpgw']->link('/index.php',$linkData));
+ $this->t->set_var('lang_mark_messages_as',lang('mark
messages as'));
+ $this->t->set_var('lang_delete_selected',lang('delete
selected messages'));
$this->t->parse("out","main");
***************
*** 595,598 ****
--- 645,654 ----
return $bytes . '<small> ' . $type . '</small>';
+ }
+
+ function toggleFilter()
+ {
+ $this->bofelamimail->toggleFilter();
+ $this->viewMainScreen();
}
Index: class.uifilter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/Attic/class.uifilter.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.uifilter.inc.php 4 Jun 2002 12:24:02 -0000 1.1.2.1
--- class.uifilter.inc.php 20 Jun 2002 12:46:27 -0000 1.1.2.2
***************
*** 74,78 ****
--- 74,83 ----
$this->t->set_var("from",$this->sessionData['filter']['from']);
+
$this->t->set_var("to",$this->sessionData['filter']['to']);
$this->t->set_var("subject",$this->sessionData['filter']['subject']);
+ if($this->sessionData['filter']['filterActive'] ==
"true")
+ {
+ $this->t->set_var("filter_checked","checked");
+ }
$this->t->pparse("out","header");
***************
*** 81,86 ****
function saveFilter()
{
! $formData['from'] =
$GLOBALS['HTTP_POST_VARS']['from'];
! $formData['subject'] =
$GLOBALS['HTTP_POST_VARS']['subject'];
$this->bofelamimail->saveFilter($formData);
--- 86,96 ----
function saveFilter()
{
! $formData['from'] =
$GLOBALS['HTTP_POST_VARS']['from'];
! $formData['to'] =
$GLOBALS['HTTP_POST_VARS']['to'];
! $formData['subject'] =
$GLOBALS['HTTP_POST_VARS']['subject'];
! if($GLOBALS['HTTP_POST_VARS']['filter_active'] == "on")
! {
! $formData['filterActive'] = "true";
! }
$this->bofelamimail->saveFilter($formData);
***************
*** 103,107 ****
--- 113,119 ----
$this->t->set_var("lang_message_list",lang('Message
List'));
$this->t->set_var("lang_from",lang('from'));
+ $this->t->set_var("lang_to",lang('to'));
$this->t->set_var("lang_subject",lang('subject'));
+ $this->t->set_var("lang_filter_active",lang('filter
active'));
$this->t->set_var("bg01",$GLOBALS['phpgw_info']["theme"]["bg01"]);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: felamimail/inc class.bofelamimail.inc.php,1.2.2.5,1.2.2.6 class.socaching.inc.php,1.1.1.1.2.3,1.1.1.1.2.4 class.uifelamimail.inc.php,1.2.2.5,1.2.2.6 class.uifilter.inc.php,1.1.2.1,1.1.2.2,
Lars Kneschke <address@hidden> <=