From: <sy...@us...> - 2006-07-28 20:30:48
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30992/lib Modified Files: Tag: BRANCH-1-9 tikilib.php Log Message: add a param categId=1 to the articles plugins Index: tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.514.2.267 retrieving revision 1.514.2.268 diff -u -d -r1.514.2.267 -r1.514.2.268 --- tikilib.php 22 Jul 2006 22:36:36 -0000 1.514.2.267 +++ tikilib.php 27 Jul 2006 15:25:15 -0000 1.514.2.268 @@ -2283,11 +2283,13 @@ } /*shared*/ - function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_desc', $find = '', $date = '', $user=false, $type = '', $topicId = '', $visible_only = 'y', $topic='') { + function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_desc', $find = '', $date = '', $user=false, $type = '', $topicId = '', $visible_only = 'y', $topic='', $categId='') { global $userlib, $user; $mid = ''; $bindvars=array(); + $fromSql = ''; + if ($find) { $findesc = '%' . $find . '%'; $mid = " where (`title` like ? or `heading` like ? or `body` like ?) "; @@ -2398,6 +2400,10 @@ $mid2 = " where "; $mid2 .= " `tiki_articles`.`type` = `tiki_article_types`.`type`"; + if ($categId) { + global $categlib; require_once('lib/categories/categlib.php'); + $categlib->getSqlJoin($categId, 'article', '`tiki_articles`.`articleId`', $fromSql, $mid2, $bindvars); + } $query = "select `tiki_articles`.*, `tiki_article_types`.`use_ratings`, `tiki_article_types`.`show_pre_publ`, @@ -2417,10 +2423,10 @@ `tiki_article_types`.`show_image_caption`, `tiki_article_types`.`show_lang`, `tiki_article_types`.`creator_edit` - from `tiki_articles`, `tiki_article_types` + from `tiki_articles`, `tiki_article_types`$fromSql $mid $mid2 order by ".$this->convert_sortmode($sort_mode); $result = $this->query($query,$bindvars,$maxRecords,$offset); - $query_cant = "select count(*) from `tiki_articles`, `tiki_article_types` $mid $mid2"; + $query_cant = "select count(*) from `tiki_articles`, `tiki_article_types` $fromSql $mid $mid2"; $cant = $this->getOne($query_cant,$bindvars); $ret = array(); |