[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.3,1.4 class.
|
From: |
Angelo Tony Puglisi <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.3,1.4 class.bofilters.inc.php,1.9,1.10 class.uifilters.inc.php,1.7,1.8 |
|
Date: |
Sat, 26 Jan 2002 17:47:05 -0500 |
Update of /cvsroot/phpgroupware//email/inc
In directory subversions:/tmp/cvs-serv20814/email/inc
Modified Files:
class.bocompose.inc.php class.bofilters.inc.php
class.uifilters.inc.php
Log Message:
fix erroneous mime headers for mail not being forwarded bug, add move up and
move down action to filter list page
Index: class.bocompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.bocompose.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bocompose.inc.php 17 Jan 2002 20:53:50 -0000 1.3
--- class.bocompose.inc.php 26 Jan 2002 22:47:03 -0000 1.4
***************
*** 19,24 ****
'compose' => True
);
! //var $debug = True;
! var $debug = False;
var $xi;
var $xml_functions = array();
--- 19,24 ----
'compose' => True
);
! //var $debug = 3;
! var $debug = 0;
var $xi;
var $xml_functions = array();
***************
*** 69,73 ****
// "start your engines"
! if ($this->debug == True) { echo
'email.bocompose.compose: call msg->begin_request with args array:<pre>';
print_r($args_array); echo '</pre>'; }
$some_stream =
$GLOBALS['phpgw']->msg->begin_request($args_array);
// error if login failed
--- 69,73 ----
// "start your engines"
! if ($this->debug > 1) { echo 'email.bocompose.compose:
call msg->begin_request with args array:<pre>'; print_r($args_array); echo
'</pre>'; }
$some_stream =
$GLOBALS['phpgw']->msg->begin_request($args_array);
// error if login failed
***************
*** 84,87 ****
--- 84,89 ----
if
($GLOBALS['phpgw']->msg->get_isset_arg('["msgball"]["msgnum"]'))
{
+ if ($this->debug > 1) { echo
'email.bocompose.compose: get_isset_arg ["msgball"]["msgnum"] is TRUE <br>'; }
+ if ($this->debug > 1) { echo
'email.bocompose.compose: $GLOBALS[phpgw]->msg->get_arg_value(action) :
['.$GLOBALS['phpgw']->msg->get_arg_value('action').'] <br>'; }
$msgball =
$GLOBALS['phpgw']->msg->get_arg_value('msgball');
$msg_headers =
$GLOBALS['phpgw']->msg->phpgw_header($msgball);
***************
*** 390,398 ****
{
// generally, msgball arg exists when
reply,replyall, or forward is being done
! // if it exists, preserve (carry forward) its
"folder" and "acctnum" values
$send_btn_action = $GLOBALS['phpgw']->link(
'/index.php',
'menuaction=email.bosend.send'
! .'&action=forward'
.'&'.$msgball['uri']
// this is used to preserve
these values when we return to folder list after the send
--- 392,401 ----
{
// generally, msgball arg exists when
reply,replyall, or forward is being done
! // if it exists, preserve (carry forward) its
"folder" "action" and "acctnum" values
$send_btn_action = $GLOBALS['phpgw']->link(
'/index.php',
'menuaction=email.bosend.send'
! //.'&action=forward'
!
.'&action='.$GLOBALS['phpgw']->msg->get_arg_value('action')
.'&'.$msgball['uri']
// this is used to preserve
these values when we return to folder list after the send
Index: class.bofilters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.bofilters.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.bofilters.inc.php 26 Jan 2002 12:45:51 -0000 1.9
--- class.bofilters.inc.php 26 Jan 2002 22:47:03 -0000 1.10
***************
*** 18,22 ****
'process_submitted_data' => True,
'delete_filter' => True,
! 'do_filter' => True
);
--- 18,24 ----
'process_submitted_data' => True,
'delete_filter' => True,
! 'do_filter' => True,
! 'move_up' => True,
! 'move_down' => True
);
***************
*** 190,193 ****
--- 192,269 ----
}
+ function move_up()
+ {
+ // "False" means return $this->not_set if no filter
number was found anywhere
+ $found_filter_num = $this->obtain_filer_num(False);
+ if ($this->debug > 1) { echo 'bofilters.move_up:
$found_filter_num :
[<code>'.serialize($found_filter_num).'</code>]<br>'."\r\n"; }
+
+ if ($found_filter_num == $this->not_set)
+ {
+ if ($this->debug > 0) { echo
'bofilters.move_up: LEAVING with error, no filter num was found<br>'."\r\n"; }
+ return False;
+ }
+ elseif($this->filter_exists($found_filter_num) == False)
+ {
+ if ($this->debug > 0) { echo
'bofilters.move_up: LEAVING with error, filter $found_filter_num
[<code>'.serialize($found_filter_num).'</code>] does not exist<br>'."\r\n"; }
+ return False;
+ }
+ elseif((string)$found_filter_num == '0')
+ {
+ if ($this->debug > 0) { echo
'bofilters.move_up: LEAVING with error, filter $found_filter_num
[<code>'.serialize($found_filter_num).'</code>] can not be moved
up<br>'."\r\n"; }
+ return False;
+ }
+ // if we get here we need to move up this filter
+ $take_my_position =
$this->all_filters[$found_filter_num-1];
+ $im_moving_up = $this->all_filters[$found_filter_num];
+ $this->all_filters[$found_filter_num-1] = array();
+ $this->all_filters[$found_filter_num-1] = $im_moving_up;
+ $this->all_filters[$found_filter_num] = array();
+ $this->all_filters[$found_filter_num] =
$take_my_position;
+ $this->save_all_filters_to_repository();
+ // redirect user back to filters list page
+ $take_me_to_url = $GLOBALS['phpgw']->link(
+
'/index.php',
+
'menuaction=email.uifilters.filters_list');
+ if ($this->debug_set_prefs > 0) { echo
'bofilters.move_up: LEAVING with redirect to: <br>'.$take_me_to_url.'<br>'; }
+ Header('Location: ' . $take_me_to_url);
+ }
+
+ function move_down()
+ {
+ // "False" means return $this->not_set if no filter
number was found anywhere
+ $found_filter_num = $this->obtain_filer_num(False);
+ if ($this->debug > 1) { echo 'bofilters.move_down:
$found_filter_num :
[<code>'.serialize($found_filter_num).'</code>]<br>'."\r\n"; }
+
+ if ($found_filter_num == $this->not_set)
+ {
+ if ($this->debug > 0) { echo
'bofilters.move_down: LEAVING with error, no filter num was found<br>'."\r\n"; }
+ return False;
+ }
+ elseif($this->filter_exists($found_filter_num) == False)
+ {
+ if ($this->debug > 0) { echo
'bofilters.move_down: LEAVING with error, filter $found_filter_num
[<code>'.serialize($found_filter_num).'</code>] does not exist<br>'."\r\n"; }
+ return False;
+ }
+ elseif($found_filter_num ==
(count($this->all_filters)-1))
+ {
+ if ($this->debug > 0) { echo
'bofilters.move_down: LEAVING with error, filter $found_filter_num
[<code>'.serialize($found_filter_num).'</code>] can not be moved
down<br>'."\r\n"; }
+ return False;
+ }
+ // if we get here we need to move up this filter
+ $take_my_position =
$this->all_filters[$found_filter_num+1];
+ $im_moving_down = $this->all_filters[$found_filter_num];
+ $this->all_filters[$found_filter_num+1] = array();
+ $this->all_filters[$found_filter_num+1] =
$im_moving_down;
+ $this->all_filters[$found_filter_num] = array();
+ $this->all_filters[$found_filter_num] =
$take_my_position;
+ $this->save_all_filters_to_repository();
+ // redirect user back to filters list page
+ $take_me_to_url = $GLOBALS['phpgw']->link(
+
'/index.php',
+
'menuaction=email.uifilters.filters_list');
+ if ($this->debug_set_prefs > 0) { echo
'bofilters.move_down: LEAVING with redirect to: <br>'.$take_me_to_url.'<br>'; }
+ Header('Location: ' . $take_me_to_url);
+ }
+
function process_submitted_data()
{
***************
*** 204,210 ****
//$found_filter_num = $this->obtain_filer_num(False);
$found_filter_num = $this->obtain_filer_num();
! // is_bool is in the php3 compat library
! if ((is_bool($found_filter_num))
! && ($found_filter_num == False))
{
echo 'bofilters.process_submitted_data: LEAVING
with ERROR, unable to obtain POST filter_num';
--- 280,284 ----
//$found_filter_num = $this->obtain_filer_num(False);
$found_filter_num = $this->obtain_filer_num();
! if ((string)$found_filter_num == $this->not_set)
{
echo 'bofilters.process_submitted_data: LEAVING
with ERROR, unable to obtain POST filter_num';
Index: class.uifilters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.uifilters.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uifilters.inc.php 26 Jan 2002 12:45:51 -0000 1.7
--- class.uifilters.inc.php 26 Jan 2002 22:47:03 -0000 1.8
***************
*** 546,549 ****
--- 546,561 ----
$tr_color =
$this->nextmatchs->alternate_row_color($tr_color);
+ $filters_list[$i]['move_up_url'] =
$GLOBALS['phpgw']->link(
+
'/index.php',
+
'menuaction=email.bofilters.move_up'
+
.'&filter_num='.$i);
+ $filters_list[$i]['move_up_href'] = '<a
href="'.$filters_list[$i]['move_up_url'].'">'.lang('Move Up').'</a>';
+
+ $filters_list[$i]['move_down_url'] =
$GLOBALS['phpgw']->link(
+
'/index.php',
+
'menuaction=email.bofilters.move_down'
+
.'&filter_num='.$i);
+ $filters_list[$i]['move_down_href'] =
'<a href="'.$filters_list[$i]['move_down_url'].'">'.lang('Move Down').'</a>';
+
$filters_list[$i]['edit_url'] =
$GLOBALS['phpgw']->link(
'/index.php',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.3,1.4 class.bofilters.inc.php,1.9,1.10 class.uifilters.inc.php,1.7,1.8,
Angelo Tony Puglisi <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.8,1.9 class.mail_msg_wrappers.inc.php,1.30,1.31 class.uifilters.inc.php,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: phpgroupware/doc inlinedocparser.php,1.26,1.27
- Previous by thread:
[Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.8,1.9 class.mail_msg_wrappers.inc.php,1.30,1.31 class.uifilters.inc.php,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: phpgroupware/doc inlinedocparser.php,1.26,1.27
- Index(es):