[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: forum/inc class.boforum.inc.php,1.1.2.6,1.1.2.7
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: forum/inc class.boforum.inc.php,1.1.2.6,1.1.2.7 class.uiadmin.inc.php,1.1.2.2,1.1.2.3 class.uiforum.inc.php,1.1.2.6,1.1.2.7 |
|
Date: |
Tue, 04 Jun 2002 10:14:50 -0400 |
Update of /cvsroot/phpgroupware/forum/inc
In directory subversions:/tmp/cvs-serv32585/inc
Modified Files:
Tag: Version-0_9_14-branch
class.boforum.inc.php class.uiadmin.inc.php
class.uiforum.inc.php
Log Message:
fix for bug 514
Index: class.boforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.boforum.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** class.boforum.inc.php 15 Feb 2002 03:54:59 -0000 1.1.2.6
--- class.boforum.inc.php 4 Jun 2002 14:14:48 -0000 1.1.2.7
***************
*** 193,204 ****
{
$cats = $this->so->get_cat_ids();
! while(list($key,$cat) = each($cats))
{
! $summary[$key] = $cat;
! $temp =
$this->so->get_thread_summary($cat['id']);
! $summary[$key]['last_post'] =
$temp['last_post'];
! $summary[$key]['total'] = $temp['total'];
}
- return $summary;
}
--- 193,208 ----
{
$cats = $this->so->get_cat_ids();
!
! if (is_array($cats))
{
! while(list($key,$cat) = each($cats))
! {
! $summary[$key] = $cat;
! $temp =
$this->so->get_thread_summary($cat['id']);
! $summary[$key]['last_post'] =
$temp['last_post'];
! $summary[$key]['total'] =
$temp['total'];
! }
! return $summary;
}
}
Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiadmin.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** class.uiadmin.inc.php 17 Apr 2002 01:24:05 -0000 1.1.2.2
--- class.uiadmin.inc.php 4 Jun 2002 14:14:48 -0000 1.1.2.3
***************
*** 119,140 ****
$this->template->set_var($var);
! while(list($key,$cat) = each($cats))
{
! $var = Array(
! 'CAT_NAME' => $cat['name'],
! 'CAT_DESC' =>
($cat['descr']?$cat['descr']:' '),
! 'EDIT_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
! Array(
! 'menuaction'
=> 'forum.uiadmin.edit_category',
! 'cat_id'
=> $cat['id']
! )
! ),
! 'DEL_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
! Array(
! 'menuaction'
=> 'forum.uiadmin.delete_category',
! 'cat_id'
=> $cat['id']
)
! )
! );
$this->template->set_var($var);
--- 119,144 ----
$this->template->set_var($var);
! if (is_array($cats))
{
! while(list($key,$cat) = each($cats))
! {
! $var = Array(
! 'CAT_NAME' => $cat['name'],
! 'CAT_DESC' =>
($cat['descr']?$cat['descr']:' '),
! 'EDIT_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
! Array(
!
'menuaction' => 'forum.uiadmin.edit_category',
!
'cat_id' => $cat['id']
! )
! ),
! 'DEL_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
! Array(
!
'menuaction' => 'forum.uiadmin.delete_category',
!
'cat_id' => $cat['id']
! )
)
! );
! }
!
$this->template->set_var($var);
***************
*** 144,148 ****
$forums =
$this->bo->get_forums_for_cat($cat['id']);
! if(sizeof($forums))
{
while(list($key,$forum) = each($forums))
--- 148,152 ----
$forums =
$this->bo->get_forums_for_cat($cat['id']);
! if(sizeof($forums) != 0)
{
while(list($key,$forum) = each($forums))
***************
*** 413,420 ****
// for the drop down category
$cats = $this->bo->get_all_cat_info();
! while(list($key,$cat) = each($cats))
{
!
$this->template->set_var('SELECTED','<option'.($this->bo->cat_id ==
$cat['id']?' selected':'').' value="'.$cat['id'].'">'.$cat['name'].'</option>');
!
$this->template->parse('DROP_DOWN','SELECTED',true);
}
--- 417,428 ----
// for the drop down category
$cats = $this->bo->get_all_cat_info();
!
! if (is_array($cats))
{
! while(list($key,$cat) = each($cats))
! {
!
$this->template->set_var('SELECTED','<option'.($this->bo->cat_id ==
$cat['id']?' selected':'').' value="'.$cat['id'].'">'.$cat['name'].'</option>');
!
$this->template->parse('DROP_DOWN','SELECTED',true);
! }
}
Index: class.uiforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiforum.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** class.uiforum.inc.php 21 Apr 2002 18:46:55 -0000 1.1.2.6
--- class.uiforum.inc.php 4 Jun 2002 14:14:48 -0000 1.1.2.7
***************
*** 97,118 ****
$cats = $this->bo->get_all_cat_info();
! while(list($key,$cat) = each($cats))
{
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $var = Array(
! 'COLOR' => $tr_color,
! 'CAT' => $cat['name'],
! 'DESC' => $cat['descr'],
! 'CAT_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
! Array(
! 'menuaction'
=> 'forum.uiforum.forum',
! 'cat_id'
=> $cat['id']
! )
! ),
! 'value_last_post' => $cat['last_post'],
! 'value_total' => $cat['total']
! );
! $this->template->set_var($var);
!
$this->template->parse('CatF','CategoryForum',true);
}
$this->template->parse('Out','INDEX');
--- 97,121 ----
$cats = $this->bo->get_all_cat_info();
! if (is_array($cats))
{
! while(list($key,$cat) = each($cats))
! {
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $var = Array(
! 'COLOR' => $tr_color,
! 'CAT' => $cat['name'],
! 'DESC' => $cat['descr'],
! 'CAT_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
! Array(
!
'menuaction' => 'forum.uiforum.forum',
!
'cat_id' => $cat['id']
! )
! ),
! 'value_last_post' =>
$cat['last_post'],
! 'value_total' =>
$cat['total']
! );
! $this->template->set_var($var);
!
$this->template->parse('CatF','CategoryForum',true);
! }
}
$this->template->parse('Out','INDEX');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: forum/inc class.boforum.inc.php,1.1.2.6,1.1.2.7 class.uiadmin.inc.php,1.1.2.2,1.1.2.3 class.uiforum.inc.php,1.1.2.6,1.1.2.7,
Bettina Gille <address@hidden> <=