Commit e72cb625 authored by changi67's avatar changi67

checkstyle - see http://quality.tiki.org

parent 028563d5
......@@ -22,17 +22,17 @@ $headerlib->add_jsfile('lib/jquery_tiki/tiki-connect.js');
if (empty($prefs['connect_site_title'])) {
$defaults = json_encode(
array(
'connect_site_title' => $prefs['browsertitle'],
'connect_site_email' => $userlib->get_admin_email(),
'connect_site_url' => $base_url,
'connect_site_keywords' => $prefs['metatag_keywords'],
'connect_site_location' => $prefs['gmap_defaultx'] . ',' . $prefs['gmap_defaulty'] . ',' . $prefs['gmap_defaultz'],
)
array(
'connect_site_title' => $prefs['browsertitle'],
'connect_site_email' => $userlib->get_admin_email(),
'connect_site_url' => $base_url,
'connect_site_keywords' => $prefs['metatag_keywords'],
'connect_site_location' => $prefs['gmap_defaultx'] . ',' . $prefs['gmap_defaulty'] . ',' . $prefs['gmap_defaultz'],
)
);
$headerlib->add_jq_onready(
'$("#connect_defaults_btn a").click(function(){
'$("#connect_defaults_btn a").click(function(){
var connect_defaults = ' . $defaults . ';
for (el in connect_defaults) {
$("input[name=" + el + "]").val(connect_defaults[el]);
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -38,8 +38,8 @@ $tikidomain = '';
/*
SVN Developers: Do not change any of the above.
Instead, create a file, called db/local.php, containing any of
the variables listed above that are different for your
development environment. This will protect you from
the variables listed above that are different for your
development environment. This will protect you from
accidentally committing your username/password to SVN!
example of db/local.php
......@@ -64,7 +64,7 @@ or TIKI_VIRTUAL
or SERVER_NAME
From apache directive ServerName set for that virtualhost block
or HTTP_HOST
From the real domain name called in the browser
From the real domain name called in the browser
(can be ServerAlias from apache conf)
*/
......@@ -104,11 +104,11 @@ if ( file_exists($local_php) ) {
global $systemConfiguration;
$systemConfiguration = new Zend_Config(
array(
'preference' => array(),
'rules' => array(),
),
array('readOnly' => false)
array(
'preference' => array(),
'rules' => array(),
),
array('readOnly' => false)
);
if (isset ($system_configuration_file)) {
if (! is_readable($system_configuration_file)) {
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -15,8 +15,8 @@ require_once('tiki-setup.php');
// I would kindly ask a wizard to enlarge this. (filmil)
if ($tiki_p_admin != 'y') {
$smarty->assign(
'msg',
tra("This feature is for admins only") . ": show_raw_links"
'msg',
tra("This feature is for admins only") . ": show_raw_links"
);
$smarty->display("error.tpl");
die;
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -19,8 +19,8 @@ function post_20090416_plugin_security_tiki($installer)
foreach ($data as $fingerprint => $string) {
list($status, $timestamp, $user) = explode('/', $string);
$installer->query(
"INSERT INTO tiki_plugin_security (fingerprint, status, approval_by, last_update, last_objectType, last_objectId) VALUES(?, ?, ?, ?, '', '')",
array($fingerprint, $status, $user, $timestamp)
"INSERT INTO tiki_plugin_security (fingerprint, status, approval_by, last_update, last_objectType, last_objectId) VALUES(?, ?, ?, ?, '', '')",
array($fingerprint, $status, $user, $timestamp)
);
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -15,8 +15,8 @@ function post_20091214_perspective_management_tiki($installer)
$result = $installer->query('SELECT perspectiveId, pref, value FROM tiki_perspective_preferences');
while ($row = $result->fetchRow()) {
$installer->query(
'UPDATE tiki_perspective_preferences SET value = ? WHERE perspectiveId = ? and pref = ?',
array(serialize($row['value']), $row['perspectiveId'], $row['pref'])
'UPDATE tiki_perspective_preferences SET value = ? WHERE perspectiveId = ? and pref = ?',
array(serialize($row['value']), $row['perspectiveId'], $row['pref'])
);
}
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -19,14 +19,14 @@ function pre_20100623_semantic_to_relation_tiki($installer)
foreach ($reltypes as $type) {
$installer->query(
'INSERT INTO tiki_object_relations (relation, source_type, source_itemId, target_type, target_itemId) VALUES(?, ?, ?, ?, ?)',
array(
'tiki.link.' . $type,
'wiki page',
$row['fromPage'],
'wiki page',
$row['toPage'],
)
'INSERT INTO tiki_object_relations (relation, source_type, source_itemId, target_type, target_itemId) VALUES(?, ?, ?, ?, ?)',
array(
'tiki.link.' . $type,
'wiki page',
$row['fromPage'],
'wiki page',
$row['toPage'],
)
);
}
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -25,13 +25,13 @@ function upgrade_20110905_multibyte_lc_fix_tiki($installer)
$new = md5('wiki page' . $mblowercase);
$objectperms->updateMultiple(
array(
'objectId' => $new,
),
array(
'objectType' => 'wiki page',
'objectId' => $old,
)
array(
'objectId' => $new,
),
array(
'objectType' => 'wiki page',
'objectId' => $old,
)
);
}
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -31,11 +31,13 @@ function post_20120904_category_root_tiki($installer)
$root = $findRoot($categId, $findRoot);
if ($root != $categId) {
$categs->update(array(
'rootId' => $root,
), array(
'categId' => $categId,
));
$categs->update(
array(
'rootId' => $root,
), array(
'categId' => $categId,
)
);
}
}
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -44,7 +44,7 @@ class BlogLib extends TikiDb_Bridge
if ( $jail = $categlib->get_jail() ) {
$categlib->getSqlJoin($jail, 'blog', '`tiki_blogs`.`blogId`', $join, $where, $bindvars);
}
}
if ($find) {
$findesc = '%' . $find . '%';
......@@ -54,7 +54,7 @@ class BlogLib extends TikiDb_Bridge
if (isset($with['showlastpost'])) {
$query = "SELECT tb.*, tbp.`postId`, tbp.`created` as postCreated, tbp.`user` as postUser, tbp.`title` as postTitle, tbp.`data` as postData FROM `tiki_blogs` tb, `tiki_blog_posts` tbp $join where tb.`blogId` = tbp.`blogId` and tbp.`created` = (select max(`created`) from `tiki_blog_posts` tbp2 where tbp2.`blogId`=tb.`blogId` order by `created` desc) $where order by tb.".$this->convertSortMode($sort_mode);
} else {
$query = "select * from `tiki_blogs` $join WHERE 1=1 $where order by `tiki_blogs`." . $this->convertSortMode($sort_mode);
$query = "select * from `tiki_blogs` $join WHERE 1=1 $where order by `tiki_blogs`." . $this->convertSortMode($sort_mode);
}
$result = $this->fetchAll($query, $bindvars);
......@@ -90,7 +90,7 @@ class BlogLib extends TikiDb_Bridge
*/
function get_blog($blogId)
{
global $tikilib, $prefs, $user, $categlib; if (!$categlib) require_once 'lib/categories/categlib.php';
global $tikilib, $prefs, $user, $categlib; if (!$categlib) require_once 'lib/categories/categlib.php';
$bindvars = array();
......@@ -186,7 +186,7 @@ class BlogLib extends TikiDb_Bridge
//FIXME Perm:filter ?
foreach ( $result as $res ) {
if ( (!empty($user) and $user == $res['user']) || $tiki_p_blog_admin == 'y' || $tikilib->user_has_perm_on_object($user, $res['blogId'], 'blog', 'tiki_p_blog_admin') || ($res['public'] == 'y' && $tikilib->user_has_perm_on_object($user, $res['blogId'], 'blog', 'tiki_p_blog_post')))
if ( (!empty($user) and $user == $res['user']) || $tiki_p_blog_admin == 'y' || $tikilib->user_has_perm_on_object($user, $res['blogId'], 'blog', 'tiki_p_blog_admin') || ($res['public'] == 'y' && $tikilib->user_has_perm_on_object($user, $res['blogId'], 'blog', 'tiki_p_blog_post')))
$ret[] = $res;
}
return $ret;
......@@ -274,8 +274,8 @@ class BlogLib extends TikiDb_Bridge
}
$query = "select `title` from `tiki_blogs` where `blogId`=?";
$cant_com = $this->getOne(
"select count(*) from `tiki_comments` where `object`=? and `objectType` = ?",
array((string) $res["postId"],'blog')
"select count(*) from `tiki_comments` where `object`=? and `objectType` = ?",
array((string) $res["postId"],'blog')
);
$res["comments"] = $cant_com;
$res["blogTitle"] = $this->getOne($query, array((int)$blogId));
......@@ -438,19 +438,19 @@ class BlogLib extends TikiDb_Bridge
* @access public
* @return int blogId
*/
function replace_blog($title, $description, $user, $public, $maxPosts, $blogId,
$heading, $use_title, $use_title_in_post, $use_description, $use_breadcrumbs,
$use_author, $add_date, $use_find, $allow_comments, $show_avatar, $alwaysOwner,
function replace_blog($title, $description, $user, $public, $maxPosts, $blogId,
$heading, $use_title, $use_title_in_post, $use_description, $use_breadcrumbs,
$use_author, $add_date, $use_find, $allow_comments, $show_avatar, $alwaysOwner,
$post_heading, $show_related, $related_max, $use_excerpt, $created = 0, $lastModif = 0
)
{
//TODO: all the display parameters can be one single array parameter
global $tikilib, $prefs;
if ($lastModif == 0) {
$lastModif = $tikilib->now;
}
if ($blogId) {
$query = "update `tiki_blogs` set `title`=? ,`description`=?,`user`=?,`public`=?,`lastModif`=?,`maxPosts`=?,`heading`=?,`use_title`=?,`use_title_in_post`=?,`use_description`=?,`use_breadcrumbs`=?,`use_author`=?,`add_date`=?,`use_find`=?,`allow_comments`=?,`show_avatar`=?,`always_owner`=?, `post_heading`=?, `show_related`=?, `related_max`=?, `use_excerpt`=? where `blogId`=?";
......@@ -460,7 +460,7 @@ class BlogLib extends TikiDb_Bridge
if ($created == 0) {
$created = $tikilib->now;
}
$query = "insert into `tiki_blogs`(`created`,`lastModif`,`title`,`description`,`user`,`public`,`posts`,`maxPosts`,`hits`,`heading`,`use_title`,`use_title_in_post`,`use_description`,`use_breadcrumbs`,`use_author`,`add_date`,`use_find`,`allow_comments`,`show_avatar`,`always_owner`,`post_heading`, `show_related`, `related_max`, `use_excerpt`) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
$result = $this->query($query, array($created, $lastModif, $title, $description, $user, $public, 0, (int) $maxPosts, 0, $heading, $use_title, $use_title_in_post, $use_description, $use_breadcrumbs, $use_author, $add_date, $use_find, $allow_comments, $show_avatar, $alwaysOwner, $post_heading, $show_related, $related_max, $use_excerpt));
......@@ -494,16 +494,16 @@ class BlogLib extends TikiDb_Bridge
* @access public
* @return array posts
*/
function list_blog_posts($blogId = 0, $allowDrafts = false, $offset = 0,
$maxRecords = -1, $sort_mode = 'created_desc', $find = '',
function list_blog_posts($blogId = 0, $allowDrafts = false, $offset = 0,
$maxRecords = -1, $sort_mode = 'created_desc', $find = '',
$date_min = '', $date_max = '', $approved = 'y'
)
{
global $tikilib, $tiki_p_admin, $tiki_p_blog_admin, $tiki_p_blog_post, $user;
global $commentslib; require_once('lib/comments/commentslib.php');
$parserlib = TikiLib::lib('parser');
if (!is_object($commentslib)) {
$commentslib = new Comments();
}
......@@ -575,7 +575,7 @@ class BlogLib extends TikiDb_Bridge
}
if (isset($res['wysiwyg']) && $res['wysiwyg'] == 'n')
$res['data'] = $parserlib->parse_data($res['data']);
$res['data'] = $parserlib->parse_data($res['data']);
$ret[] = $res;
}
......@@ -588,7 +588,7 @@ class BlogLib extends TikiDb_Bridge
}
/**
* list_blog_post_comments List all the comments in posts for all the blogs
* list_blog_post_comments List all the comments in posts for all the blogs
*
* @param string $approved
* @param int $maxRecords
......@@ -717,12 +717,12 @@ class BlogLib extends TikiDb_Bridge
$wysiwyg=$is_wysiwyg==TRUE?'y':'n';
if (!$created) {
$created = $tikilib->now;
$created = $tikilib->now;
}
$data = TikiFilter::get('purifier')->filter($data);
$excerpt = TikiFilter::get('purifier')->filter($excerpt);
$query = "insert into `tiki_blog_posts`(`blogId`,`data`,`excerpt`,`created`,`user`,`title`,`priv`,`wysiwyg`) values(?,?,?,?,?,?,?,?)";
$result = $this->query($query, array((int) $blogId, $data, $excerpt, (int) $created, $user, $title, $priv, $wysiwyg));
$query = "select max(`postId`) from `tiki_blog_posts` where `created`=? and `user`=?";
......@@ -751,7 +751,7 @@ class BlogLib extends TikiDb_Bridge
$reportsManager = Reports_Factory::build('Reports_Manager');
$reportsManager->addToCache($nots, array("event"=>'blog_post', "blogId"=>$blogId, "blogTitle"=>$blogTitle, "postId"=>$id, "user"=>$user));
}
if (count($nots)) {
include_once("lib/notifications/notificationemaillib.php");
$smarty->assign('mail_site', $_SERVER["SERVER_NAME"]);
......@@ -959,7 +959,7 @@ class BlogLib extends TikiDb_Bridge
* @access public
* @return void
*/
function update_post($postId, $blogId, $data, $excerpt, $user, $title = '',
function update_post($postId, $blogId, $data, $excerpt, $user, $title = '',
$contributions = '', $priv='n', $created = 0, $is_wysiwyg=FALSE
)
{
......@@ -973,7 +973,7 @@ class BlogLib extends TikiDb_Bridge
$wysiwyg=$is_wysiwyg==TRUE?'y':'n';
if ($prefs['feature_blog_edit_publish_date'] == 'y') {
if (!$created) {
$created = $tikilib->now;
$created = $tikilib->now;
}
$query = "update `tiki_blog_posts` set `blogId`=?,`data`=?,`excerpt`=?,`created`=?,`user`=?,`title`=?, `priv`=?, `wysiwyg`=? where `postId`=?";
$result = $this->query($query, array($blogId, $data, $excerpt, $created,$user, $title, $priv, $wysiwyg, $postId));
......@@ -1052,7 +1052,7 @@ class BlogLib extends TikiDb_Bridge
// Purge old activity
$query = "delete from `tiki_blog_activity` where `day`<?";
$result = $this->query($query, array((int) $day2));
// Register new activity
$query = "select count(*) from `tiki_blog_activity` where `blogId`=? and `day`=?";
$result = $this->getOne($query, array((int) $blogId, (int)$today));
......@@ -1075,7 +1075,7 @@ class BlogLib extends TikiDb_Bridge
$query = "update `tiki_blogs` set `activity`=? where `blogId`=?";
$result = $this->query($query, array($activity, (int) $blogId));
}
/**
* Returns the title of the blog "blogId"
*
......
......@@ -188,8 +188,8 @@ class ContributionLib extends TikiLib
$query = 'select * from `tiki_history` where `pageName`=? and `lastModif` <=? and `lastModif` >= ? and `user`=?';
$result = $tikilib->query(
$query,
array($action['object'], $action['lastModif']+$delay, $action['lastModif'], $action['user'])
$query,
array($action['object'], $action['lastModif']+$delay, $action['lastModif'], $action['user'])
);
if (($nb = $result->numRows()) == 1) {
......
......@@ -21,11 +21,14 @@ class JisonParser_Phraser_Handler extends JisonParser_Phraser
function setCssWordClasses($classes = array())
{
$classes = array_merge(array(
'start' => '',
'middle' => '',
'end' => ''
), $classes);
$classes = array_merge(
array(
'start' => '',
'middle' => '',
'end' => ''
),
$classes
);
$this->cssClassStart = $classes['start'];
$this->cssClassMiddle = $classes['middle'];
......
......@@ -33,8 +33,8 @@ class JisonParser_Wiki_HtmlCharacter
function parse(&$content)
{
foreach($this->chars as &$char) {
foreach ($this->chars as &$char) {
$content = preg_replace($char['exp'], $char['output'], $content);
}
}
}
\ No newline at end of file
}
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -16,21 +16,21 @@ class Report_Definition_Logs
"value"=> $type,
);
}
$actions = array(
array(
"label"=> tr("All"),
"value"=> ""
)
);
foreach (TikiLib::lib('logsqry')->listActions() as $action) {
$actions[] = array(
"label"=> tr(ucwords($action)),
"value"=> $action,
);
}
$fields = array();
foreach (TikiLib::fetchAll("SHOW COLUMNS FROM tiki_actionlog") as $column) {
$fields[] = array(
......@@ -38,7 +38,7 @@ class Report_Definition_Logs
"value"=> $column['Field'],
);
}
return array(
"values"=> array(
"logs"=> $logs,
......@@ -145,21 +145,21 @@ class Report_Definition_Logs
function output($values = array())
{
global $tikilib,$user;
$qry = TikiLib::lib("logsqry")
->type($values['logs']['value'])
->action($values['logs']['action']['value'])
->start(strtotime($values['logs']['start']['value']))
->end(strtotime($values['logs']['end']['value']));
$usersItems = array();//user items need to be choosable as to what type
foreach ($tikilib->fetchAll(
"SELECT itemId FROM tiki_tracker_items WHERE createdBy = ?",
array($user)
"SELECT itemId FROM tiki_tracker_items WHERE createdBy = ?",
array($user)
) as $item) {
$usersItems[] = $item['itemId'];
}
if (!empty($values['logs']['grouping'])) {
switch($values['logs']['grouping']['value']) {
case "count":
......@@ -179,11 +179,11 @@ class Report_Definition_Logs
break;
}
}
if (!empty($values['logs']['limit'])) {
$qry->limit($values['logs']['limit']['value']);
}
if (!empty($values['logs']['sort'])) {
switch ($values['logs']['sort']['value']) {
case "asc":
......@@ -194,12 +194,12 @@ class Report_Definition_Logs
break;
}
}
$result = $qry->fetchAll();
if (!empty($values['logs']['fields'])) {
$newResult = array();
foreach ($result as $row) {
$newRow = array();
foreach ($values['logs']['fields'] as $field) {
......@@ -207,17 +207,17 @@ class Report_Definition_Logs
}
$newResult[] = $newRow;
}
$result = $newResult;
}
//date correction/format
foreach ($result as $key => $row) {
if (isset($result[$key]['lastModif']))
$result[$key]['lastModif'] = $tikilib->get_short_datetime($result[$key]['lastModif']);
$result[$key]['lastModif'] = $tikilib->get_short_datetime($result[$key]['lastModif']);
}
return $result;
}
}
......@@ -14,18 +14,18 @@ class Reports_Send_EmailBuilder_CalendarChanged extends Reports_Send_EmailBuilde
{
return tr('New calendar events:');
}
public function getOutput(array $change)
{
$base_url = $change['data']['base_url'];
$calendarlib = TikiLib::lib('calendar');
$item = $calendarlib->get_item($change['data']['calitemId']);
$output = tr(
'%0 added or updated event %1',
"<u>{$change['data']['user']}</u>",
"<a href='{$base_url}tiki-calendar_edit_item.php?viewcalitemId={$change['data']['calitemId']}'>{$item['name']}</a>"
'%0 added or updated event %1',
"<u>{$change['data']['user']}</u>",
"<a href='{$base_url}tiki-calendar_edit_item.php?viewcalitemId={$change['data']['calitemId']}'>{$item['name']}</a>"
);
return $output;
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
/**
* Class for wiki_page_changed events
* Class for wiki_page_changed events
*/
class Reports_Send_EmailBuilder_WikiPageChanged extends Reports_Send_EmailBuilder_Abstract
{
......@@ -14,21 +14,21 @@ class Reports_Send_EmailBuilder_WikiPageChanged extends Reports_Send_EmailBuilde
{
return tr('Wiki pages updated:');
}
public function getOutput(array $change)
{
$base_url = $change['data']['base_url'];
$newVersion = $change['data']['oldVer'] + 1;
$output = tr(
"%0 edited the wikipage %1 (<a href=%2>this history</a>, <a href=%3>all history</a>)",
"<u>{$change['data']['editUser']}</u>",
"<a href=\"{$base_url}tiki-index.php?page={$change['data']['pageName']}\">{$change['data']['pageName']}</a>",
"\"{$base_url}tiki-pagehistory.php?page={$change['data']['pageName']}&diff_style=sidediff&compare=Compare&newver=$newVersion&oldver={$change['data']['oldVer']}\"",
"\"{$base_url}tiki-pagehistory.php?page={$change['data']['pageName']}&diff_style=sidediff&compare=Compare&newver=0&oldver={$change['data']['oldVer']}\""
"%0 edited the wikipage %1 (<a href=%2>this history</a>, <a href=%3>all history</a>)",
"<u>{$change['data']['editUser']}</u>",
"<a href=\"{$base_url}tiki-index.php?page={$change['data']['pageName']}\">{$change['data']['pageName']}</a>",
"\"{$base_url}tiki-pagehistory.php?page={$change['data']['pageName']}&diff_style=sidediff&compare=Compare&newver=$newVersion&oldver={$change['data']['oldVer']}\"",
"\"{$base_url}tiki-pagehistory.php?page={$change['data']['pageName']}&diff_style=sidediff&compare=Compare&newver=0&oldver={$change['data']['oldVer']}\""
);
return $output;
}
}
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -25,10 +25,10 @@ class Search_ContentSource_CommentSource implements Search_ContentSource_Interfa
$comments = $this->db->table('tiki_comments');
return $comments->fetchColumn(
'threadId',
array(
'objectType' => $comments->in($this->types),
)
'threadId',
array(
'objectType' => $comments->in($this->types),
)
);
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -55,19 +55,19 @@ class Search_ContentSource_TrackerItemSource implements Search_ContentSource_Int
}
$data = array_merge(
$data,
array(
'title' => $typeFactory->sortable($this->trklib->get_isMain_value($item['trackerId'], $objectId)),
'modification_date' => $typeFactory->timestamp($item['lastModif']),
'contributors' => $typeFactory->multivalue(array_unique(array($item['createdBy'], $item['lastModifBy']))),