[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] messenger/inc class.bomessenger.inc.php, 1.2.2.3.2.4,
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] messenger/inc class.bomessenger.inc.php, 1.2.2.3.2.4, 1.2.2.3.2.5 class.somessenger.inc.php, 1.1.4.4, 1.1.4.5 class.uimessenger.inc.php, 1.2.4.1, 1.2.4.2 |
|
Date: |
Fri, 10 Oct 2003 01:44:41 +0000 |
Update of /cvsroot/phpgroupware/messenger/inc
In directory subversions:/tmp/cvs-serv25951/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bomessenger.inc.php class.somessenger.inc.php
class.uimessenger.inc.php
Log Message:
sql and globals
Index: class.uimessenger.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/class.uimessenger.inc.php,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** class.uimessenger.inc.php 26 Mar 2003 22:56:22 -0000 1.2.4.1
--- class.uimessenger.inc.php 10 Oct 2003 01:44:38 -0000 1.2.4.2
***************
*** 74,78 ****
function delete()
{
! $messages = $GLOBALS['HTTP_GET_VARS']['messages'] ?
$GLOBALS['HTTP_GET_VARS']['messages'] : $GLOBALS['HTTP_POST_VARS']['messages'];
$this->bo->delete_message($messages);
--- 74,78 ----
function delete()
{
! $messages = $_GET['messages'] ? $_GET['messages'] :
$_POST['messages'];
$this->bo->delete_message($messages);
***************
*** 82,88 ****
function inbox()
{
! $start = $GLOBALS['HTTP_GET_VARS']['start'] ?
$GLOBALS['HTTP_GET_VARS']['start'] : $GLOBALS['HTTP_POST_VARS']['start'];
! $order = $GLOBALS['HTTP_GET_VARS']['order'] ?
$GLOBALS['HTTP_GET_VARS']['order'] : $GLOBALS['HTTP_POST_VARS']['order'];
! $sort = $GLOBALS['HTTP_GET_VARS']['sort'] ?
$GLOBALS['HTTP_GET_VARS']['sort'] : $GLOBALS['HTTP_POST_VARS']['sort'];
$total = $this->bo->total_messages();
--- 82,88 ----
function inbox()
{
! $start = $_GET['start'] ? $_GET['start'] :
$_POST['start'];
! $order = $_GET['order'] ? $_GET['order'] :
$_POST['order'];
! $sort = $_GET['sort'] ? $_GET['sort'] :
$_POST['sort'];
$total = $this->bo->total_messages();
***************
*** 188,192 ****
function compose($errors = '')
{
! $message = $GLOBALS['HTTP_POST_VARS']['message'];
$this->display_headers();
--- 188,192 ----
function compose($errors = '')
{
! $message = $_POST['message'];
$this->display_headers();
***************
*** 216,220 ****
function read_message()
{
! $message_id = $GLOBALS['HTTP_GET_VARS']['message_id'] ?
$GLOBALS['HTTP_GET_VARS']['message_id'] :
$GLOBALS['HTTP_POST_VARS']['message_id'];
$message = $this->bo->read_message($message_id);
--- 216,220 ----
function read_message()
{
! $message_id = $_GET['message_id'] ? $_GET['message_id']
: $_POST['message_id'];
$message = $this->bo->read_message($message_id);
***************
*** 265,269 ****
function reply($errors = '', $message = '')
{
! $message_id = $GLOBALS['HTTP_GET_VARS']['message_id'] ?
$GLOBALS['HTTP_GET_VARS']['message_id'] :
$GLOBALS['HTTP_POST_VARS']['message_id'];
if(is_array($errors))
--- 265,269 ----
function reply($errors = '', $message = '')
{
! $message_id = $_GET['message_id'] ? $_GET['message_id']
: $_POST['message_id'];
if(is_array($errors))
***************
*** 304,308 ****
function forward($errors = '', $message = '')
{
! $message_id = $GLOBALS['HTTP_GET_VARS']['message_id'] ?
$GLOBALS['HTTP_GET_VARS']['message_id'] :
$GLOBALS['HTTP_POST_VARS']['message_id'];
if(is_array($errors))
--- 304,308 ----
function forward($errors = '', $message = '')
{
! $message_id = $_GET['message_id'] ? $_GET['message_id']
: $_POST['message_id'];
if(is_array($errors))
Index: class.bomessenger.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/class.bomessenger.inc.php,v
retrieving revision 1.2.2.3.2.4
retrieving revision 1.2.2.3.2.5
diff -C2 -d -r1.2.2.3.2.4 -r1.2.2.3.2.5
*** class.bomessenger.inc.php 3 Apr 2003 00:51:07 -0000 1.2.2.3.2.4
--- class.bomessenger.inc.php 10 Oct 2003 01:44:38 -0000 1.2.2.3.2.5
***************
*** 76,82 ****
else
{
! $message =
$GLOBALS['HTTP_POST_VARS']['message'];
! $send = $GLOBALS['HTTP_POST_VARS']['send'];
! $cancel = $GLOBALS['HTTP_POST_VARS']['cancel'];
}
--- 76,82 ----
else
{
! $message = $_POST['message'];
! $send = $_POST['send'];
! $cancel = $_POST['cancel'];
}
***************
*** 163,169 ****
else
{
! $message =
$GLOBALS['HTTP_POST_VARS']['message'];
! $send = $GLOBALS['HTTP_POST_VARS']['send'];
! $cancel = $GLOBALS['HTTP_POST_VARS']['cancel'];
}
--- 163,169 ----
else
{
! $message = $_POST['message'];
! $send = $_POST['send'];
! $cancel = $_POST['cancel'];
}
***************
*** 280,284 ****
if(!$n_message)
{
! $n_message =
$GLOBALS['HTTP_POST_VARS']['n_message'];
}
--- 280,284 ----
if(!$n_message)
{
! $n_message = $_POST['n_message'];
}
***************
*** 329,334 ****
if(!$message_id)
{
! $message_id =
$GLOBALS['HTTP_POST_VARS']['message_id'];
! $n_message =
$GLOBALS['HTTP_POST_VARS']['n_message'];
}
--- 329,334 ----
if(!$message_id)
{
! $message_id = $_POST['message_id'];
! $n_message = $_POST['n_message'];
}
***************
*** 351,356 ****
if(!$message_id)
{
! $message_id =
$GLOBALS['HTTP_POST_VARS']['message_id'];
! $n_message =
$GLOBALS['HTTP_POST_VARS']['n_message'];
}
--- 351,356 ----
if(!$message_id)
{
! $message_id = $_POST['message_id'];
! $n_message = $_POST['n_message'];
}
Index: class.somessenger.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/class.somessenger.inc.php,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -C2 -d -r1.1.4.4 -r1.1.4.5
*** class.somessenger.inc.php 29 Apr 2003 18:33:22 -0000 1.1.4.4
--- class.somessenger.inc.php 10 Oct 2003 01:44:38 -0000 1.1.4.5
***************
*** 24,28 ****
{
$this->db = $GLOBALS['phpgw']->db;
! $this->owner =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->xmlrpc_methods[] = array(
--- 24,28 ----
{
$this->db = $GLOBALS['phpgw']->db;
! $this->owner =
intval($GLOBALS['phpgw_info']['user']['account_id']);
$this->xmlrpc_methods[] = array(
***************
*** 34,39 ****
function update_message_status($status, $message_id)
{
! $this->db->query("update phpgw_messenger_messages set
message_status='$status' where message_id='"
! . $message_id . "' and message_owner='" .
$this->owner ."'",__LINE__,__FILE__);
return ($this->db->affected_rows() ? True : False);
--- 34,41 ----
function update_message_status($status, $message_id)
{
! $this->db->query('UPDATE phpgw_messenger_messages'
! . " SET
message_status='".$this->db->db_addslashes($status)."'"
! . " WHERE message_id='" .
intval($message_id) . "'"
! . ' AND message_owner=' .
$this->owner,__LINE__,__FILE__);
return ($this->db->affected_rows() ? True : False);
***************
*** 46,58 ****
if ($sort && $order)
{
! $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
! . "' $sortmethod",$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
--- 48,62 ----
if ($sort && $order)
{
! $sortmethod = ' ORDER BY ' .
$this->db->db_addslashes($order)
! . ' ' .
$this->db->db_addslashes($sort);
}
else
{
! $sortmethod = ' ORDER BY message_date ASC';
}
! $this->db->limit_query('SELECT * FROM
phpgw_messenger_messages'
! . ' WHERE message_owner=' .
$this->owner
! .
$sortmethod,intval($start),__LINE__,__FILE__);
while ($this->db->next_record())
{
***************
*** 71,76 ****
function read_message($message_id)
{
! $this->db->query("select * from
phpgw_messenger_messages where message_id='"
! . $message_id . "' and message_owner='" .
$this->owner ."'",__LINE__,__FILE__);
$this->db->next_record();
$message = array(
--- 75,81 ----
function read_message($message_id)
{
! $this->db->query('SELECT * FROM
phpgw_messenger_messages '
! . ' WHERE message_id=' .
intval($message_id) . ' '
! . ' AND message_owner=' .
$this->owner,__LINE__,__FILE__);
$this->db->next_record();
$message = array(
***************
*** 79,84 ****
'status' => $this->db->f('message_status'),
'date' => $this->db->f('message_date'),
! 'subject' => $this->db->f('message_subject'),
! 'content' => $this->db->f('message_content')
);
if ($this->db->f('message_status') == 'N')
--- 84,89 ----
'status' => $this->db->f('message_status'),
'date' => $this->db->f('message_date'),
! 'subject' => $this->db->f('message_subject',
True),
! 'content' => $this->db->f('message_content',
True)
);
if ($this->db->f('message_status') == 'N')
***************
*** 98,108 ****
if (! ereg('^[0-9]+$',$message['to']))
{
! $message['to'] =
$GLOBALS['phpgw']->accounts->name2id($message['to']);
}
! $this->db->query("insert into phpgw_messenger_messages
(message_owner, message_from, message_status, "
! . "message_date, message_subject,
message_content) values ('"
! . $message['to'] . "','" . $this->owner .
"','N','" . time() . "','"
! . addslashes($message['subject']) . "','"
. addslashes($message['content'])
. "')",__LINE__,__FILE__);
}
--- 103,115 ----
if (! ereg('^[0-9]+$',$message['to']))
{
! $message['to'] =
intval($GLOBALS['phpgw']->accounts->name2id($message['to']));
}
! $this->db->query('INSERT INTO phpgw_messenger_messages'
! . ' (message_owner, message_from,
message_status, '
! . 'message_date, message_subject,
message_content) VALUES('
! . $message['to'] . ',' . $this->owner .
"','N','" . time() . "','"
! . $this->db->db_addslashes($message['subject'])
. "',"
! . "'" .
$this->db->db_addslashes($message['content'])
. "')",__LINE__,__FILE__);
}
***************
*** 110,115 ****
function total_messages($extra_where_clause = '')
{
! $this->db->query("select count(*) from
phpgw_messenger_messages where message_owner='"
! . $this->owner . "' " .
$extra_where_clause,__LINE__,__FILE__);
$this->db->next_record();
return $this->db->f(0);
--- 117,123 ----
function total_messages($extra_where_clause = '')
{
! $this->db->query('SELECT COUNT(*) FROM
phpgw_messenger_messages'
! . ' WHERE message_owner=' . $this->owner . ' '
! . $extra_where_clause,__LINE__,__FILE__);
$this->db->next_record();
return $this->db->f(0);
***************
*** 118,123 ****
function delete_message($message_id)
{
! $this->db->query("delete from phpgw_messenger_messages
where message_id='$message_id' and "
! . "message_owner='" . $this->owner .
"'",__LINE__,__FILE__);
}
}
--- 126,132 ----
function delete_message($message_id)
{
! $this->db->query('DELETE FROM phpgw_messenger_messages'
! . 'WHERE message_id='. intval($message_id)
! . ' AND message_owner=' .
$this->owner,__LINE__,__FILE__);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] messenger/inc class.bomessenger.inc.php, 1.2.2.3.2.4, 1.2.2.3.2.5 class.somessenger.inc.php, 1.1.4.4, 1.1.4.5 class.uimessenger.inc.php, 1.2.4.1, 1.2.4.2,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] headlines deleteheadline.php, 1.9, 1.9.4.1 editheadline.php, 1.12.2.1, 1.12.2.1.2.1 newheadline.php, 1.13.2.1, 1.13.2.1.2.1 preferences.php, 1.19.2.1, 1.19.2.1.2.1 viewheadline.php, 1.9, 1.9.4.1
- Next by Date:
[Phpgroupware-cvs] notes/inc class.bo.inc.php, 1.2.2.1.2.2, 1.2.2.1.2.3 class.so.inc.php, 1.2.4.3, 1.2.4.4 hook_deleteaccount.inc.php, 1.1, 1.1.4.1
- Previous by thread:
[Phpgroupware-cvs] headlines deleteheadline.php, 1.9, 1.9.4.1 editheadline.php, 1.12.2.1, 1.12.2.1.2.1 newheadline.php, 1.13.2.1, 1.13.2.1.2.1 preferences.php, 1.19.2.1, 1.19.2.1.2.1 viewheadline.php, 1.9, 1.9.4.1
- Next by thread:
[Phpgroupware-cvs] notes/inc class.bo.inc.php, 1.2.2.1.2.2, 1.2.2.1.2.3 class.so.inc.php, 1.2.4.3, 1.2.4.4 hook_deleteaccount.inc.php, 1.1, 1.1.4.1
- Index(es):