[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: messenger/inc class.bomessenger.inc.php,1.2.2.3
|
From: |
Joseph Engo <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: messenger/inc class.bomessenger.inc.php,1.2.2.3,1.2.2.3.2.1 class.somessenger.inc.php,1.1,1.1.4.1class.uimessenger.inc.php,1.2,1.2.4.1 |
|
Date: |
Wed, 26 Mar 2003 17:56:24 -0500 |
Update of /cvsroot/phpgroupware/messenger/inc
In directory subversions:/tmp/cvs-serv8956
Modified Files:
Tag: Version-0_9_16-branch
class.bomessenger.inc.php class.somessenger.inc.php
class.uimessenger.inc.php
Log Message:
- Fixes for XML-RPC
- Small code clean ups and bug fixes
Index: class.bomessenger.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/class.bomessenger.inc.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.3.2.1
diff -C2 -r1.2.2.3 -r1.2.2.3.2.1
*** class.bomessenger.inc.php 4 Mar 2003 22:12:29 -0000 1.2.2.3
--- class.bomessenger.inc.php 26 Mar 2003 22:56:22 -0000 1.2.2.3.2.1
***************
*** 19,23 ****
var $so;
var $public_functions = array(
- 'delete_message' => True,
'send_message' => True,
'send_global_message' => True,
--- 19,22 ----
***************
*** 33,36 ****
--- 32,40 ----
}
+ function update_message_status($p)
+ {
+ return
$this->so->update_message_status($p['status'],$p['message_id']);
+ }
+
function send_global_message($data='')
{
***************
*** 155,161 ****
}
! function read_inbox($start,$order,$sort)
{
! $messages = $this->so->read_inbox($start,$order,$sort);
while (is_array($messages) && list(,$message) =
each($messages))
--- 159,169 ----
}
! function read_inbox($values)
{
! $start = $values['start'];
! $order = $values['order'];
! $sort = $values['sort'];
!
! $messages =
$this->so->read_inbox((int)$start,$order,$sort);
while (is_array($messages) && list(,$message) =
each($messages))
***************
*** 185,189 ****
{
$message['subject'] = '<b>' .
$message['subject'] . '</b>';
! $message['status'] = ' ';
$message['date'] = '<b>' .
$GLOBALS['phpgw']->common->show_date($message['date']) . '</b>';
$message['from'] = '<b>' .
$cached_names[$message['from']] . '</b>';
--- 193,197 ----
{
$message['subject'] = '<b>' .
$message['subject'] . '</b>';
! //$message['status'] = 'N';
$message['date'] = '<b>' .
$GLOBALS['phpgw']->common->show_date($message['date']) . '</b>';
$message['from'] = '<b>' .
$cached_names[$message['from']] . '</b>';
***************
*** 197,201 ****
if ($message['status'] == 'O')
{
! $message['status'] = ' ';
}
--- 205,209 ----
if ($message['status'] == 'O')
{
! //$message['status'] = ' ';
}
***************
*** 205,209 ****
'status' => $message['status'],
'date' => $message['date'],
! 'subject' => $message['subject']
);
}
--- 213,218 ----
'status' => $message['status'],
'date' => $message['date'],
! 'subject' => $message['subject'],
! 'content' => $message['content']
);
}
***************
*** 213,217 ****
function read_message($message_id)
{
! $message = $this->so->read_message($message_id);
$message['date'] =
$GLOBALS['phpgw']->common->show_date($message['date']);
--- 222,226 ----
function read_message($message_id)
{
! $message = $this->so->read_message((int)$message_id);
$message['date'] =
$GLOBALS['phpgw']->common->show_date($message['date']);
***************
*** 266,279 ****
function delete_message($messages='')
{
- if(!$messages)
- {
- $messages =
$GLOBALS['HTTP_POST_VARS']['messages'] ? $GLOBALS['HTTP_POST_VARS']['messages']
: $GLOBALS['HTTP_GET_VARS']['messages'];
- }
-
if (! is_array($messages))
{
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.inbox'));
return False;
}
$this->so->db->transaction_begin();
while (list(,$message_id) = each($messages))
--- 275,283 ----
function delete_message($messages='')
{
if (! is_array($messages))
{
return False;
}
+
$this->so->db->transaction_begin();
while (list(,$message_id) = each($messages))
***************
*** 282,286 ****
}
$this->so->db->transaction_commit();
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.inbox'));
}
--- 286,289 ----
***************
*** 357,366 ****
'read_message' => array(
'function' =>
'read_message',
! 'signature' =>
array(array(xmlrpcStruct,xmlrpcString)),
'docstring' =>
lang('Read a single message.')
),
'read_inbox' => array(
'function' =>
'read_inbox',
! 'signature' =>
array(array(xmlrpcStruct,xmlrpcString,xmlrpcString,xmlrpcString)),
'docstring' =>
lang('Read a list of messages.')
),
--- 360,369 ----
'read_message' => array(
'function' =>
'read_message',
! 'signature' =>
array(array(xmlrpcStruct,xmlrpcInt)),
'docstring' =>
lang('Read a single message.')
),
'read_inbox' => array(
'function' =>
'read_inbox',
! 'signature' =>
array(array(xmlrpcStruct,xmlrpcStruct)),
'docstring' =>
lang('Read a list of messages.')
),
***************
*** 369,372 ****
--- 372,380 ----
'signature' =>
array(array(xmlrpcStruct,xmlrpcStruct)),
'docstring' =>
lang('Send a message to a single recipient.')
+ ),
+ 'update_message_status' =>
array(
+ 'function' =>
'update_message_status',
+ 'signature' =>
array(array(xmlrpcBoolean,xmlrpcStruct)),
+ 'docstring' =>
lang('Update a message status')
),
'send_global_message' => array(
Index: class.somessenger.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/class.somessenger.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** class.somessenger.inc.php 22 Sep 2001 02:21:47 -0000 1.1
--- class.somessenger.inc.php 26 Mar 2003 22:56:22 -0000 1.1.4.1
***************
*** 30,33 ****
--- 30,34 ----
$this->db->query("update phpgw_messenger_messages set
message_status='$status' where message_id='"
. $message_id . "' and message_owner='" .
$this->owner ."'",__LINE__,__FILE__);
+ return True;
}
***************
*** 38,41 ****
--- 39,46 ----
$sortmethod = " order by $order $sort";
}
+ else
+ {
+ $sortmethod = ' order by message_date asc';
+ }
$this->db->limit_query("select * from
phpgw_messenger_messages where message_owner='" . $this->owner
***************
*** 48,52 ****
'status' =>
$this->db->f('message_status'),
'date' =>
$this->db->f('message_date'),
! 'subject' =>
$this->db->f('message_subject')
);
}
--- 53,58 ----
'status' =>
$this->db->f('message_status'),
'date' =>
$this->db->f('message_date'),
! 'subject' =>
$this->db->f('message_subject'),
! 'content' =>
$this->db->f('message_content')
);
}
Index: class.uimessenger.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/class.uimessenger.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** class.uimessenger.inc.php 5 Dec 2001 02:22:38 -0000 1.2
--- class.uimessenger.inc.php 26 Mar 2003 22:56:22 -0000 1.2.4.1
***************
*** 25,29 ****
'read_message' => True,
'reply' => True,
! 'forward' => True
);
--- 25,30 ----
'read_message' => True,
'reply' => True,
! 'forward' => True,
! 'delete' => True
);
***************
*** 71,74 ****
--- 72,83 ----
}
+ function delete()
+ {
+ $messages = $GLOBALS['HTTP_GET_VARS']['messages'] ?
$GLOBALS['HTTP_GET_VARS']['messages'] : $GLOBALS['HTTP_POST_VARS']['messages'];
+ $this->bo->delete_message($messages);
+
+ $this->inbox();
+ }
+
function inbox()
{
***************
*** 94,106 ****
$this->template->set_var('sort_from','<a href="' .
$this->nextmatchs->show_sort_order($sort,'message_from',$order,'/index.php','','&menuaction=messenger.uimessenger.inbox',False)
. '" class="topsort">' . lang('From') . '</a>');
! $messages = $this->bo->read_inbox($start,$order,$sort);
while (is_array($messages) && list(,$message) =
each($messages))
{
!
$this->template->set_var('row_status',$message['status']);
$this->template->set_var('row_from',$message['from']);
$this->template->set_var('row_date',$message['date']);
$this->template->set_var('row_subject','<a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.read_message&message_id='
. $message['id']) . '">' . $message['subject'] . '</a>');
!
$this->template->set_var('row_status',$message['status']);
$this->template->set_var('row_checkbox','<input
type="checkbox" name="messages[]" value="' . $message['id'] . '">');
--- 103,125 ----
$this->template->set_var('sort_from','<a href="' .
$this->nextmatchs->show_sort_order($sort,'message_from',$order,'/index.php','','&menuaction=messenger.uimessenger.inbox',False)
. '" class="topsort">' . lang('From') . '</a>');
! $params = array(
! 'start' => $start,
! 'order' => $order,
! 'sort' => $sort
! );
! $messages = $this->bo->read_inbox($params);
while (is_array($messages) && list(,$message) =
each($messages))
{
! $status = $message['status'] . '-';
! if ($message['status'] == 'N' ||
$message['status'] == 'O')
! {
! $status = ' ';
! }
!
$this->template->set_var('row_from',$message['from']);
$this->template->set_var('row_date',$message['date']);
$this->template->set_var('row_subject','<a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.read_message&message_id='
. $message['id']) . '">' . $message['subject'] . '</a>');
! $this->template->set_var('row_status',$status);
$this->template->set_var('row_checkbox','<input
type="checkbox" name="messages[]" value="' . $message['id'] . '">');
***************
*** 115,119 ****
else
{
!
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.bomessenger.delete_message'));
$this->template->set_var('button_delete','<input type="image" src="' .
PHPGW_IMAGES . '/delete.gif" name="delete" title="' . lang('Delete selected') .
'" border="0">');
}
--- 134,138 ----
else
{
!
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.delete'));
$this->template->set_var('button_delete','<input type="image" src="' .
PHPGW_IMAGES . '/delete.gif" name="delete" title="' . lang('Delete selected') .
'" border="0">');
}
***************
*** 212,216 ****
$this->template->set_var('link_delete','<a href="'
! .
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.bomessenger.delete_message&messages%5B%5D='
. $message['id'])
. '">' . lang('Delete') . '</a>');
--- 231,235 ----
$this->template->set_var('link_delete','<a href="'
! .
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.delete&messages%5B%5D='
. $message['id'])
. '">' . lang('Delete') . '</a>');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: messenger/inc class.bomessenger.inc.php,1.2.2.3,1.2.2.3.2.1 class.somessenger.inc.php,1.1,1.1.4.1class.uimessenger.inc.php,1.2,1.2.4.1,
Joseph Engo <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.1.2.4,1.1.2.4.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101.2.13,1.101.2.13.2.1 class.accounts_sql.inc.php,1.80.2.8,1.80.2.8.2.1 class.acl.inc.php,1.65,1.65.4.1 class.applications.inc.php,1.45.2.1,1.45.2.1.2.1 class.sessions_db.inc.php,1.2.2.10,1.2.2.10.2.1 class.xmlrpc_server.inc.php,1.22,1.22.4.1 functions.inc.php,1.121.2.13,1.121.2.13.2.1 xml_functions.inc.php,1.22.2.1,1.22.2.1.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.1.2.4,1.1.2.4.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101.2.13,1.101.2.13.2.1 class.accounts_sql.inc.php,1.80.2.8,1.80.2.8.2.1 class.acl.inc.php,1.65,1.65.4.1 class.applications.inc.php,1.45.2.1,1.45.2.1.2.1 class.sessions_db.inc.php,1.2.2.10,1.2.2.10.2.1 class.xmlrpc_server.inc.php,1.22,1.22.4.1 functions.inc.php,1.121.2.13,1.121.2.13.2.1 xml_functions.inc.php,1.22.2.1,1.22.2.1.2.1
- Index(es):