[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/inc hook_deleteaccount.inc.php,NONE,1.1.
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc hook_deleteaccount.inc.php,NONE,1.1.2.1 class.soinfolog.inc.php,1.10,1.10.2.1 |
|
Date: |
Wed, 20 Nov 2002 14:54:06 -0500 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv13419/inc
Modified Files:
Tag: Version-0_9_14-branch
class.soinfolog.inc.php
Added Files:
Tag: Version-0_9_14-branch
hook_deleteaccount.inc.php
Log Message:
added a hook_deleteaccount
***** Error reading new file: [Errno 2] No such file or directory:
'hook_deleteaccount.inc.php'
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** class.soinfolog.inc.php 4 Oct 2001 19:04:58 -0000 1.10
--- class.soinfolog.inc.php 20 Nov 2002 19:54:03 -0000 1.10.2.1
***************
*** 1,292 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare - InfoLog
*
! * http://www.phpgroupware.org
*
! * Written by Ralf Becker <address@hidden> *
! * originaly based on todo written by Joseph Engo <address@hidden> *
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! class soinfolog // DB-Layer
! {
! var $db,$db2;
! var $grants;
! var $data = array( );
! var $filters = array( );
! var $user;
! var $maybe_slashes = array (
!
'info_des'=>1,'info_subject'=>1,'info_from'=>1,'info_addr'=>1
! );
! function soinfolog( $info_id = 0)
! {
! $this->db = $GLOBALS['phpgw']->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants('infolog');
! $this->user =
$GLOBALS['phpgw_info']['user']['account_id'];
!
! $this->read( $info_id );
! }
!
!
! function check_access( $info_id,$required_rights )
! {
! if ($info_id != $this->data['info_id']) //
already loaded?
! {
! // dont change our own internal data,
! // dont use new as it changes $phpgw->db
! $private_info = $this;
! $info = $private_info->read($info_id);
! }
! else
! {
! $info = $this->data;
! }
! if (!$info || !$info_id)
! {
! return False;
! }
! $owner = $info['info_owner'];
!
! $access_ok = $owner == $this->user || //
user has all rights
! // ACL only on public
entrys || $owner granted _PRIVATE
!
!!($this->grants[$owner] & $required_rights) &&
! ($info['info_access']
== 'public' ||
!
!!($this->grants[$owner] & PHPGW_ACL_PRIVATE));
!
! // echo "check_access(info_id=$info_id (owner=$owner,
user=$user),required_rights=$required_rights):
access".($access_ok?"Ok":"Denied");
!
! return $access_ok;
! }
!
! // sql to be AND into a query to ensure ACL is respected (incl.
_PRIVATE)
! // filter: none|all - list all entrys user have rights to see
! // private|own - list only his personal entrys
! // (incl.
those he is responsible for !!!)
! function aclFilter($filter = 'none')
! {
! ereg('.*(own|privat|all|none).*',$filter,$vars);
! $filter = $vars[1];
!
! if (isset($this->acl_filter[$filter]))
! {
! return $this->acl_filter[$filter]; // used
cached filter if found
! }
! if (is_array($this->grants))
! {
! while (list($user,$grant) = each($this->grants))
! {
! // echo "<p>grants: user=$user,
grant=$grant</p>";
! if ($grant &
(PHPGW_ACL_READ|PHPGW_ACL_EDIT))
! {
! $public_user_list[] = $user;
! }
! if ($grant & PHPGW_ACL_PRIVATE)
! {
! $private_user_list[] = $user;
! }
! }
! if (count($private_user_list))
! {
! $has_private_access = 'info_owner IN ('.
!
implode(',',$private_user_list).')';
! }
! }
! $filtermethod = " (info_owner=$this->user"; // user has
all rights
!
! // private: own entries plus the one user is
responsible for
! if ($filter == 'private' || $filter == 'own')
! {
! $filtermethod .= " OR
(info_responsible=$this->user OR info_status = 'offer')".
! " AND
(info_access='public'".($has_private_access?" OR $has_private_access":'').')';
! }
! else // none --> all
entrys user has rights to see
! {
! if ($has_private_access)
! {
! $filtermethod .= " OR
$has_private_access";
! }
! if (count($public_user_list))
! {
! $filtermethod .= " OR
(info_access='public' AND info_owner IN(" . implode(',',$public_user_list) .
'))';
! }
! }
! $filtermethod .= ') ';
!
! return $this->acl_filter[$filter] = $filtermethod; //
cache the filter
! }
!
! function statusFilter($filter = '')
! {
! ereg('.*(done|open|offer).*',$filter,$vars);
! $filter = $vars[1];
!
! switch ($filter)
! {
! case 'done': return " AND info_status IN
('done','billed')";
! case 'open': return " AND NOT (info_status
IN ('done','billed'))";
! case 'offer': return " AND info_status =
'offer'";
! }
! return '';
! }
!
! function dateFilter($filter = '')
! {
! ereg('.*(upcoming|today|overdue).*',$filter,$vars);
! $filter = $vars[1];
!
! $now = getdate(time());
! $tomorrow =
mktime(0,0,0,$now['mon'],$now['mday']+1,$now['year']);
!
! switch ($filter)
! {
! case 'upcoming': return " AND
info_startdate >= '$tomorrow'";
! case 'today': return " AND
info_startdate < '$tomorrow'";
! case 'overdue': return " AND (info_enddate != 0
AND info_enddate < '$tomorrow')";
! }
! return '';
! }
!
! function init()
! {
! $this->data = array( 'info_owner' => $this->user,
!
'info_pri' => 'normal' );
! }
!
! function read($info_id) // did _not_ ensure ACL
! {
! if ($info_id <= 0 || $info_id != $this->data['info_id']
&&
!
(!$this->db->query("select * FROM phpgw_infolog where info_id='$info_id'") ||
!$this->db->next_record()))
! {
! $this->init( );
! return False;
! }
! if ($info_id != $this->data['info_id']) // data
yet read in
! {
! $this->data = $this->db->Record;
! reset($this->maybe_slashes);
! while (list($key) = each($this->maybe_slashes))
! {
! $this->data[$key] =
stripslashes($this->data[$key]);
! }
! }
! return $this->data;
! }
!
! function delete($info_id) // did _not_ ensure ACL
! {
! $this->db->query("delete FROM phpgw_infolog where
info_id='$info_id' or info_id_parent='"
! . "$info_id' AND ((info_access='public' and
info_owner != '$this->user')"
! . " or (info_owner='$this->user'))"
,__LINE__,__FILE__);
!
! if ($this->data['info_id'] == $info_id)
! {
! $this->init( );
! }
! }
!
! function write($values) // did _not_ ensure ACL
! {
! while (list($key,$val) = each($values))
! {
! if ($key != 'info_id')
! {
! $key = 'info_'.$key;
!
! $this->data[$key] = $val; // update
internal data
!
! if ($this->maybe_slashes[$key])
! {
! $val = addslashes($val);
! }
! $cols .= ($cols ? ',' : '').$key;
! $vals .= ($vals ? ',' : '')."'$val'";
! $query .= ($query ? ',' :
'')."$key='$val'";
! }
! }
! if ($values['info_id'])
! {
! $query = "UPDATE phpgw_infolog SET $query where
info_id='".$values['info_id']."'";
! $this->db->query($query,__LINE__,__FILE__);
! $this->data['info_id'] = $values['info_id'];
! }
! else
! {
! $query = "INSERT INTO phpgw_infolog ($cols)
VALUES ($vals)";
! $this->db->query($query,__LINE__,__FILE__);
!
$this->data['info_id']=$this->db->get_last_insert_id('phpgw_infolog','info_id');
! }
! }
!
! function anzSubs( $info_id )
! {
! $this->db->query('select count(*) FROM phpgw_infolog
where '.
!
"info_id_parent=$info_id",__LINE__,__FILE__);
!
! $this->db->next_record();
!
! return $this->db->f(0);
! }
!
! function
readIdArray($order,$sort,$filter,$cat_id,$query,$action,$addr_id,
!
$proj_id,$info_id,$ordermethod,&$start,&$total)
! {
! if ($order)
! {
! $ordermethod = 'order by ' . $order . ' ' . $sort;
! }
! else
! {
! $ordermethod = 'order by info_datecreated desc'; //
newest first
! }
! $filtermethod = $this->aclFilter($filter);
! $filtermethod .= $this->statusFilter($filter);
! $filtermethod .= $this->dateFilter($filter);
! // echo "<p>filtermethod='$filtermethod'</p>";
!
! if ($cat_id)
! {
! $filtermethod .= " AND info_cat='$cat_id' ";
! }
! switch ($action)
! {
! case 'addr': $filtermethod .= " AND
info_addr_id=$addr_id ";
! break;
! case 'proj': $filtermethod .= " AND
info_proj_id=$proj_id ";
! break;
! }
! if ($query) // we search in
_from, _subject and _des for $query
! {
! $sql_query = "AND (info_from like '%$query%' OR
info_subject ".
! "like
'%$query%' OR info_des like '%$query%') ";
! }
! $pid = 'AND info_id_parent='.($action == 'sp' ?
$info_id : 0);
!
! if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
! $action != 'sp')
! {
! $pid = '';
! }
! $this->db->query("SELECT COUNT(*) FROM phpgw_infolog
WHERE $filtermethod $pid $sql_query",__LINE__,__FILE__);
!
! $this->db->next_record();
! $total = $this->db->f(0);
!
! if (!$start || $start > $total)
! {
! $start = 0;
! }
! $this->db->limit_query("SELECT info_id,info_id_parent
FROM phpgw_infolog WHERE $filtermethod $pid $sql_query
$ordermethod",$start,__LINE__,__FILE__);
!
! $ids = array( );
! while ($this->db->next_record())
! {
! $ids[$this->db->f('info_id')] =
$this->db->f('info_id_parent');
! }
! return $ids;
! }
! }
--- 1,308 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare - InfoLog
*
! * http://www.phpgroupware.org
*
! * Written by Ralf Becker <address@hidden> *
! * originaly based on todo written by Joseph Engo <address@hidden> *
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! class soinfolog // DB-Layer
! {
! var $db,$db2;
! var $grants;
! var $data = array( );
! var $filters = array( );
! var $user;
! var $maybe_slashes = array (
!
'info_des'=>1,'info_subject'=>1,'info_from'=>1,'info_addr'=>1
! );
! function soinfolog( $info_id = 0)
! {
! $this->db = $GLOBALS['phpgw']->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants('infolog');
! $this->user =
$GLOBALS['phpgw_info']['user']['account_id'];
!
! $this->read( $info_id );
! }
!
!
! function check_access( $info_id,$required_rights )
! {
! if ($info_id != $this->data['info_id']) //
already loaded?
! {
! // dont change our own internal data,
! // dont use new as it changes $phpgw->db
! $private_info = $this;
! $info = $private_info->read($info_id);
! }
! else
! {
! $info = $this->data;
! }
! if (!$info || !$info_id)
! {
! return False;
! }
! $owner = $info['info_owner'];
!
! $access_ok = $owner == $this->user || //
user has all rights
! // ACL only on public
entrys || $owner granted _PRIVATE
!
!!($this->grants[$owner] & $required_rights) &&
! ($info['info_access']
== 'public' ||
!
!!($this->grants[$owner] & PHPGW_ACL_PRIVATE));
!
! // echo "check_access(info_id=$info_id (owner=$owner,
user=$user),required_rights=$required_rights):
access".($access_ok?"Ok":"Denied");
!
! return $access_ok;
! }
!
! // sql to be AND into a query to ensure ACL is respected (incl.
_PRIVATE)
! // filter: none|all - list all entrys user have rights to see
! // private|own - list only his personal entrys
! // (incl.
those he is responsible for !!!)
! function aclFilter($filter = 'none')
! {
! ereg('.*(own|privat|all|none).*',$filter,$vars);
! $filter = $vars[1];
!
! if (isset($this->acl_filter[$filter]))
! {
! return $this->acl_filter[$filter]; // used
cached filter if found
! }
! if (is_array($this->grants))
! {
! while (list($user,$grant) = each($this->grants))
! {
! // echo "<p>grants: user=$user,
grant=$grant</p>";
! if ($grant &
(PHPGW_ACL_READ|PHPGW_ACL_EDIT))
! {
! $public_user_list[] = $user;
! }
! if ($grant & PHPGW_ACL_PRIVATE)
! {
! $private_user_list[] = $user;
! }
! }
! if (count($private_user_list))
! {
! $has_private_access = 'info_owner IN ('.
!
implode(',',$private_user_list).')';
! }
! }
! $filtermethod = " (info_owner=$this->user"; // user has
all rights
!
! // private: own entries plus the one user is
responsible for
! if ($filter == 'private' || $filter == 'own')
! {
! $filtermethod .= " OR
(info_responsible=$this->user OR info_status = 'offer')".
! " AND
(info_access='public'".($has_private_access?" OR $has_private_access":'').')';
! }
! else // none --> all
entrys user has rights to see
! {
! if ($has_private_access)
! {
! $filtermethod .= " OR
$has_private_access";
! }
! if (count($public_user_list))
! {
! $filtermethod .= " OR
(info_access='public' AND info_owner IN(" . implode(',',$public_user_list) .
'))';
! }
! }
! $filtermethod .= ') ';
!
! return $this->acl_filter[$filter] = $filtermethod; //
cache the filter
! }
!
! function statusFilter($filter = '')
! {
! ereg('.*(done|open|offer).*',$filter,$vars);
! $filter = $vars[1];
!
! switch ($filter)
! {
! case 'done': return " AND info_status IN
('done','billed')";
! case 'open': return " AND NOT (info_status
IN ('done','billed'))";
! case 'offer': return " AND info_status =
'offer'";
! }
! return '';
! }
!
! function dateFilter($filter = '')
! {
! ereg('.*(upcoming|today|overdue).*',$filter,$vars);
! $filter = $vars[1];
!
! $now = getdate(time());
! $tomorrow =
mktime(0,0,0,$now['mon'],$now['mday']+1,$now['year']);
!
! switch ($filter)
! {
! case 'upcoming': return " AND
info_startdate >= '$tomorrow'";
! case 'today': return " AND
info_startdate < '$tomorrow'";
! case 'overdue': return " AND (info_enddate != 0
AND info_enddate < '$tomorrow')";
! }
! return '';
! }
!
! function init()
! {
! $this->data = array( 'info_owner' => $this->user,
!
'info_pri' => 'normal' );
! }
!
! function read($info_id) // did _not_ ensure ACL
! {
! if ($info_id <= 0 || $info_id != $this->data['info_id']
&&
!
(!$this->db->query("select * FROM phpgw_infolog where info_id='$info_id'") ||
!$this->db->next_record()))
! {
! $this->init( );
! return False;
! }
! if ($info_id != $this->data['info_id']) // data
yet read in
! {
! $this->data = $this->db->Record;
! reset($this->maybe_slashes);
! while (list($key) = each($this->maybe_slashes))
! {
! $this->data[$key] =
stripslashes($this->data[$key]);
! }
! }
! return $this->data;
! }
!
! function delete($info_id) // did _not_ ensure ACL
! {
! $this->db->query("delete FROM phpgw_infolog where
info_id='$info_id' or info_id_parent='"
! . "$info_id' AND ((info_access='public' and
info_owner != '$this->user')"
! . " or (info_owner='$this->user'))"
,__LINE__,__FILE__);
!
! if ($this->data['info_id'] == $info_id)
! {
! $this->init( );
! }
! }
!
! function change_delete_owner($owner,$new_owner=0) //
new_owner=0 means delete
! {
! if (!$new_owner)
! {
! $sql = "delete FROM phpgw_infolog where
info_owner='$owner'";
! $sql2 = "update phpgw_infolog set
info_responsible='0' where info_responsible='$owner'";
! }
! else
! {
! $sql = "update phpgw_infolog set
info_owner='$new_owner' where info_owner='$owner'";
! $sql2 = "update phpgw_infolog set
info_responsible='$new_owner' where info_responsible='$owner'";
! }
! $this->db->query($sql,__LINE__,__FILE__);
! $this->db->query($sql2,__LINE__,__FILE__);
! }
!
! function write($values) // did _not_ ensure ACL
! {
! while (list($key,$val) = each($values))
! {
! if ($key != 'info_id')
! {
! $key = 'info_'.$key;
!
! $this->data[$key] = $val; // update
internal data
!
! if ($this->maybe_slashes[$key])
! {
! $val = addslashes($val);
! }
! $cols .= ($cols ? ',' : '').$key;
! $vals .= ($vals ? ',' : '')."'$val'";
! $query .= ($query ? ',' :
'')."$key='$val'";
! }
! }
! if ($values['info_id'])
! {
! $query = "UPDATE phpgw_infolog SET $query where
info_id='".$values['info_id']."'";
! $this->db->query($query,__LINE__,__FILE__);
! $this->data['info_id'] = $values['info_id'];
! }
! else
! {
! $query = "INSERT INTO phpgw_infolog ($cols)
VALUES ($vals)";
! $this->db->query($query,__LINE__,__FILE__);
!
$this->data['info_id']=$this->db->get_last_insert_id('phpgw_infolog','info_id');
! }
! }
!
! function anzSubs( $info_id )
! {
! $this->db->query('select count(*) FROM phpgw_infolog
where '.
!
"info_id_parent=$info_id",__LINE__,__FILE__);
!
! $this->db->next_record();
!
! return $this->db->f(0);
! }
!
! function
readIdArray($order,$sort,$filter,$cat_id,$query,$action,$addr_id,
!
$proj_id,$info_id,$ordermethod,&$start,&$total)
! {
! if ($order)
! {
! $ordermethod = 'order by ' . $order . ' ' . $sort;
! }
! else
! {
! $ordermethod = 'order by info_datecreated desc'; //
newest first
! }
! $filtermethod = $this->aclFilter($filter);
! $filtermethod .= $this->statusFilter($filter);
! $filtermethod .= $this->dateFilter($filter);
! // echo "<p>filtermethod='$filtermethod'</p>";
!
! if ($cat_id)
! {
! $filtermethod .= " AND info_cat='$cat_id' ";
! }
! switch ($action)
! {
! case 'addr': $filtermethod .= " AND
info_addr_id=$addr_id ";
! break;
! case 'proj': $filtermethod .= " AND
info_proj_id=$proj_id ";
! break;
! }
! if ($query) // we search in
_from, _subject and _des for $query
! {
! $sql_query = "AND (info_from like '%$query%' OR
info_subject ".
! "like
'%$query%' OR info_des like '%$query%') ";
! }
! $pid = 'AND info_id_parent='.($action == 'sp' ?
$info_id : 0);
!
! if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
! $action != 'sp')
! {
! $pid = '';
! }
! $this->db->query("SELECT COUNT(*) FROM phpgw_infolog
WHERE $filtermethod $pid $sql_query",__LINE__,__FILE__);
!
! $this->db->next_record();
! $total = $this->db->f(0);
!
! if (!$start || $start > $total)
! {
! $start = 0;
! }
! $this->db->limit_query("SELECT info_id,info_id_parent
FROM phpgw_infolog WHERE $filtermethod $pid $sql_query
$ordermethod",$start,__LINE__,__FILE__);
!
! $ids = array( );
! while ($this->db->next_record())
! {
! $ids[$this->db->f('info_id')] =
$this->db->f('info_id_parent');
! }
! return $ids;
! }
! }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc hook_deleteaccount.inc.php,NONE,1.1.2.1 class.soinfolog.inc.php,1.10,1.10.2.1,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: infolog/setup setup.inc.php,1.7.2.2,1.7.2.3
- Next by Date:
[Phpgroupware-cvs] CVS: infolog/inc hook_deleteaccount.inc.php,1.1,1.2 class.soinfolog.inc.php,1.16,1.17
- Previous by thread:
[Phpgroupware-cvs] CVS: infolog/setup setup.inc.php,1.7.2.2,1.7.2.3
- Next by thread:
[Phpgroupware-cvs] CVS: infolog/inc hook_deleteaccount.inc.php,1.1,1.2 class.soinfolog.inc.php,1.16,1.17
- Index(es):