[eGroupWare-svn] r56003 - /trunk/bookmarks/inc/class.bookmarks_so.inc.php
[email protected] Tue, 03 May 2016 22:28:25 -0000
| Newsgroups | gmane.comp.web.egroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: nathangray
Date: Wed May 4 00:28:21 2016
New Revision: 56003
URL: http://svn.stylite.de/viewvc/egroupware?rev=56003&view=rev
Log:
Include sub-categories when filtering by a category
Modified:
trunk/bookmarks/inc/class.bookmarks_so.inc.php
Modified: trunk/bookmarks/inc/class.bookmarks_so.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/bookmarks/inc/class.bookmarks_so.inc.php?rev=56003&r1=56002&r2=56003&view=diff
==============================================================================
--- trunk/bookmarks/inc/class.bookmarks_so.inc.php (original)
+++ trunk/bookmarks/inc/class.bookmarks_so.inc.php Wed May 4 00:28:21 2016
@@ -16,215 +16,218 @@
/* $Id$ */
- class bookmarks_so extends so_sql_cf
- {
- // Data we care about, but it doesn't have a DB column. Overrides parent.
- public $non_db_cols = array('added', 'updated', 'visited', 'bm_id');
-
- function __construct()
- {
- parent::__construct('bookmarks', 'egw_bookmarks', 'egw_bookmarks_extra', 'bm_', '_name', '_value', 'bm_id');
- $this->user = $GLOBALS['egw_info']['user']['account_id'];
- }
-
- public function data2db($data = null) {
- if (($intern = !is_array($data)))
- {
- $data =& $this->data;
- }
-
- if($data['added'] || $data['visited'] || $data['updated']) {
- $data['info'] = implode(',', array(
- $data['added'] ? $data['added'] : $this->data['added'],
- $data['visited'] ? $data['visited'] : $this->data['visited'],
- $data['updated'] ? $data['updated'] : $this->data['updated'],
- ));
- }
- return parent::data2db($data);
- }
-
- public function db2data($data = null) {
- if (($intern = !is_array($data)))
- {
- $data =& $this->data;
- }
-
- foreach(array('name','url','desc','keywords') as $name)
- {
- $data['stripped_'.$name] = egw::strip_html($data[$name]);
- }
- list($data['added'], $data['visited'], $data['updated']) = explode(',', $data['info']);
- $data['bm_id'] = $data['id'];
-
- return parent::db2data($intern ? null : $data);
- }
-
- function exists($url)
- {
- return $this->db->select($this->table_name,'count(*)',array('bm_url'=>$url,'bm_owner'=>$this->user),__LINE__,__FILE__)->fetchColumn(0) != 0;
- }
-
- function add($values)
- {
- if ($values['access'] !== 'public')
- {
- if ($values['access'])
+use EGroupware\Api;
+
+class bookmarks_so extends so_sql_cf
+{
+ // Data we care about, but it doesn't have a DB column. Overrides parent.
+ public $non_db_cols = array('added', 'updated', 'visited', 'bm_id');
+
+ function __construct()
+ {
+ parent::__construct('bookmarks', 'egw_bookmarks', 'egw_bookmarks_extra', 'bm_', '_name', '_value', 'bm_id');
+ $this->user = $GLOBALS['egw_info']['user']['account_id'];
+ }
+
+ public function data2db($data = null) {
+ if (($intern = !is_array($data)))
+ {
+ $data =& $this->data;
+ }
+
+ if($data['added'] || $data['visited'] || $data['updated']) {
+ $data['info'] = implode(',', array(
+ $data['added'] ? $data['added'] : $this->data['added'],
+ $data['visited'] ? $data['visited'] : $this->data['visited'],
+ $data['updated'] ? $data['updated'] : $this->data['updated'],
+ ));
+ }
+ return parent::data2db($data);
+ }
+
+ public function db2data($data = null) {
+ if (($intern = !is_array($data)))
+ {
+ $data =& $this->data;
+ }
+
+ foreach(array('name','url','desc','keywords') as $name)
+ {
+ $data['stripped_'.$name] = egw::strip_html($data[$name]);
+ }
+ list($data['added'], $data['visited'], $data['updated']) = explode(',', $data['info']);
+ $data['bm_id'] = $data['id'];
+
+ return parent::db2data($intern ? null : $data);
+ }
+
+ function exists($url)
+ {
+ return $this->db->select($this->table_name,'count(*)',array('bm_url'=>$url,'bm_owner'=>$this->user),__LINE__,__FILE__)->fetchColumn(0) != 0;
+ }
+
+ function add($values)
+ {
+ if ($values['access'] !== 'public')
+ {
+ if ($values['access'])
+ {
+ $values['access'] = 'private';
+ }
+ else
+ {
+ $values['access'] = 'public';
+ }
+ }
+
+ // Make sure there are no leftovers
+ $this->init($values);
+
+ parent::save($values);
+ return $this->data['id'];
+ }
+
+ function save($id, $values)
+ {
+ $values['updated'] = time();
+ if ($values['access'] != 'private')
+ {
+ $values['access'] = 'public';
+ }
+ return parent::save($values) === 0;
+ }
+
+ function delete($id) {
+ return parent::delete(array('id'=>$id));
+ }
+
+ function updatetimestamp($id,$timestamp = null)
+ {
+ parent::update(array(
+ 'bm_id'=> $id,
+ 'visited'=> $timestamp ? $timestamp : time(),
+ 'bm_visits=bm_visits+1'
+ ), true);
+ }
+
+ /**
+ * Get bookmarks for nextmatch widget.
+ * Re-implemented to handle category filter
+ */
+ public function get_rows(&$query, &$rows, &$readonlys) {
+
+ $criteria = array();
+ $op = 'AND';
+ if ($query['search'])
+ {
+ $wildcard = '%';
+ $criteria = is_null($this->columns_to_search) ? $this->search2criteria($query['search'],$wildcard,$op) : $query['search'];
+ }
+ if($query['cat_id']) {
+ $categories = new Api\Categories('','bookmarks');
+ $query['col_filter']['category'] = $categories->return_all_children((int)$query['cat_id']);
+ } else {
+ $query['col_filter']['category'] = (array)$GLOBALS['egw']->categories->return_array( 'all', 0 , false, '', '', '', true, null, -1, 'id' );
+ }
+
+ // Split out timestamps into sortable seperate columns mysql needs different treatment than postgres, if neither do it with php later on
+ if ($this->db->Type == 'mysql')
+ {
+ $extra_cols = array(
+ "replace(substring(substring_index(bm_info, ',', 1), length(substring_index(bm_info, ',',0)) + 1), ',', '') AS added",
+ "replace(substring(substring_index(bm_info, ',', 2), length(substring_index(bm_info, ',', 2 - 1)) + 1), ',', '') AS visited",
+ "replace(substring(substring_index(bm_info, ',', 3), length(substring_index(bm_info, ',', 3 - 1)) + 1), ',', '') AS updated"
+ );
+ }
+ elseif ($this->db->Type == 'pgsql')
+ {
+ $extra_cols = array(
+ "split_part(bm_info,',',1) AS added",
+ "split_part(bm_info,',',2) AS visited",
+ "split_part(bm_info,',',3) AS updated"
+ );
+ }
+ $rows = $this->search($criteria,false,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
+ $wildcard,false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
+ $query['col_filter'],$join,$need_full_no_count);
+ if (!$rows) $rows = array(); // otherwise false returned from search would be returned as array(false)
+
+ if (!isset($extra_cols)) // we need to create added, visited and updated from bm_info
+ {
+ foreach($rows as $key => $row)
+ {
+ list($added,$visited,$updated) = explode(',',$row['info']);
+ $rows[$key]['added'] = $added;
+ $rows[$key]['visited'] = $visited;
+ $rows[$key]['updated'] = $updated;
+ }
+ }
+
+ $selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
+ if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
+ {
+ $id2keys = array();
+ foreach($rows as $key => $row)
+ {
+ $id2keys[$row['id']] = $key;
+ }
+ // check if only certain cf's to show
+ foreach($selectcols as $col)
+ {
+ if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
+ }
+ if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
+ {
+ foreach($cfs as $id => $data)
{
- $values['access'] = 'private';
+ $rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]],$data);
}
- else
- {
- $values['access'] = 'public';
- }
- }
-
- // Make sure there are no leftovers
- $this->init($values);
-
- parent::save($values);
- return $this->data['id'];
- }
-
- function save($id, $values)
- {
- $values['updated'] = time();
- if ($values['access'] != 'private')
- {
- $values['access'] = 'public';
- }
- return parent::save($values) === 0;
- }
-
- function delete($id) {
- return parent::delete(array('id'=>$id));
- }
-
- function updatetimestamp($id,$timestamp = null)
- {
- parent::update(array(
- 'bm_id'=> $id,
- 'visited'=> $timestamp ? $timestamp : time(),
- 'bm_visits=bm_visits+1'
- ), true);
- }
-
- /**
- * Get bookmarks for nextmatch widget.
- * Re-implemented to handle category filter
- */
- public function get_rows(&$query, &$rows, &$readonlys) {
-
- $criteria = array();
- $op = 'AND';
- if ($query['search'])
- {
- $wildcard = '%';
- $criteria = is_null($this->columns_to_search) ? $this->search2criteria($query['search'],$wildcard,$op) : $query['search'];
- }
- if($query['cat_id']) {
- $query['col_filter']['category'] = $query['cat_id'];
- } else {
- $query['col_filter']['category'] = (array)$GLOBALS['egw']->categories->return_array( 'all', 0 , false, '', '', '', true, null, -1, 'id' );
- }
-
- // Split out timestamps into sortable seperate columns mysql needs different treatment than postgres, if neither do it with php later on
- if ($this->db->Type == 'mysql')
- {
- $extra_cols = array(
- "replace(substring(substring_index(bm_info, ',', 1), length(substring_index(bm_info, ',',0)) + 1), ',', '') AS added",
- "replace(substring(substring_index(bm_info, ',', 2), length(substring_index(bm_info, ',', 2 - 1)) + 1), ',', '') AS visited",
- "replace(substring(substring_index(bm_info, ',', 3), length(substring_index(bm_info, ',', 3 - 1)) + 1), ',', '') AS updated"
- );
- }
- elseif ($this->db->Type == 'pgsql')
- {
- $extra_cols = array(
- "split_part(bm_info,',',1) AS added",
- "split_part(bm_info,',',2) AS visited",
- "split_part(bm_info,',',3) AS updated"
- );
- }
- $rows = $this->search($criteria,false,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
- $wildcard,false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
- $query['col_filter'],$join,$need_full_no_count);
- if (!$rows) $rows = array(); // otherwise false returned from search would be returned as array(false)
-
- if (!isset($extra_cols)) // we need to create added, visited and updated from bm_info
- {
- foreach($rows as $key => $row)
- {
- list($added,$visited,$updated) = explode(',',$row['info']);
- $rows[$key]['added'] = $added;
- $rows[$key]['visited'] = $visited;
- $rows[$key]['updated'] = $updated;
- }
- }
-
- $selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
- if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
- {
- $id2keys = array();
- foreach($rows as $key => $row)
- {
- $id2keys[$row['id']] = $key;
- }
- // check if only certain cf's to show
- foreach($selectcols as $col)
- {
- if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
- }
- if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
- {
- foreach($cfs as $id => $data)
- {
- $rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]],$data);
- }
- }
- }
-
- return $this->total;
- }
-
- /**
- * Searches db for rows matching searchcriteria
- *
- * Reimplemented to take permissions into account
- *
- * @param array|string $criteria array of key and data cols, OR string with search pattern (incl. * or ? as wildcards)
- * @param boolean|string/array $only_keys =true True returns only keys, False returns all cols. or
- * comma seperated list or array of columns to return
- * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
- * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
- * @param string $wildcard ='' appended befor and after each criteria
- * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
- * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
- * @param mixed $start =false if != false, return only maxmatch rows begining with start, or array($start,$num), or 'UNION' for a part of a union query
- * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
- * @param string $join ='' sql to do a join, added as is after the table-name, eg. "JOIN table2 ON x=y" or
- * "LEFT JOIN table2 ON (x=y AND z=o)", Note: there's no quoting done on $join, you are responsible for it!!!
- * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
- * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
- */
- function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
- {
- //error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-
- if (!is_array($filter)) $filter = $filter ? array($filter) : array();
-
- // Grant list for permission filtering
- $grants = array();
- foreach($GLOBALS['egw']->acl->get_grants('bookmarks') as $id => $perms)
- {
- if ($perms & EGW_ACL_READ)
- {
- $grants[] = $id;
- }
- }
-
- // Permissions
- $filter[] = "(bm_access = 'public' OR bm_owner = " . (int)$GLOBALS['egw_info']['user']['account_id'] .
- ($grants ? ' OR bm_owner IN (' . implode(',', $grants) . ')' : '') . ')';
-
- return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
- }
- }
+ }
+ }
+
+ return $this->total;
+ }
+
+ /**
+ * Searches db for rows matching searchcriteria
+ *
+ * Reimplemented to take permissions into account
+ *
+ * @param array|string $criteria array of key and data cols, OR string with search pattern (incl. * or ? as wildcards)
+ * @param boolean|string/array $only_keys =true True returns only keys, False returns all cols. or
+ * comma seperated list or array of columns to return
+ * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
+ * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+ * @param string $wildcard ='' appended befor and after each criteria
+ * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
+ * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
+ * @param mixed $start =false if != false, return only maxmatch rows begining with start, or array($start,$num), or 'UNION' for a part of a union query
+ * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
+ * @param string $join ='' sql to do a join, added as is after the table-name, eg. "JOIN table2 ON x=y" or
+ * "LEFT JOIN table2 ON (x=y AND z=o)", Note: there's no quoting done on $join, you are responsible for it!!!
+ * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
+ * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
+ */
+ function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+ {
+ //error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
+
+ if (!is_array($filter)) $filter = $filter ? array($filter) : array();
+
+ // Grant list for permission filtering
+ $grants = array();
+ foreach($GLOBALS['egw']->acl->get_grants('bookmarks') as $id => $perms)
+ {
+ if ($perms & EGW_ACL_READ)
+ {
+ $grants[] = $id;
+ }
+ }
+
+ // Permissions
+ $filter[] = "(bm_access = 'public' OR bm_owner = " . (int)$GLOBALS['egw_info']['user']['account_id'] .
+ ($grants ? ' OR bm_owner IN (' . implode(',', $grants) . ')' : '') . ')';
+
+ return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+ }
+}
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z