[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.15,1.16 cl
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.15,1.16 class.soinfolog.inc.php,1.10,1.11 class.uiinfolog.inc.php,1.32,1.33 hook_addressbook_view.inc.php,1.4,1.5 hook_projects_view.inc.php,1.1,1.2 |
|
Date: |
Wed, 01 May 2002 13:16:29 -0400 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv10346
Modified Files:
class.boinfolog.inc.php class.soinfolog.inc.php
class.uiinfolog.inc.php hook_addressbook_view.inc.php
hook_projects_view.inc.php
Log Message:
added/changed the way parameters are passed to uiinfolog.get_list and
soinfolog.readIdArray
Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.boinfolog.inc.php 14 Feb 2002 20:14:15 -0000 1.15
--- class.boinfolog.inc.php 1 May 2002 17:16:27 -0000 1.16
***************
*** 228,237 ****
}
! function
readIdArray($order,$sort,$filter,$cat_id,$query,$action,$addr_id,
!
$proj_id,$info_id,$ordermethod,&$start,&$total)
{
return
$this->so->readIdArray($order,$sort,$filter,$cat_id,$query,
!
$action,$addr_id,$proj_id,$info_id,
!
$ordermethod,$start,$total);
}
--- 228,236 ----
}
! function
readIdArray($order,$sort,$filter,$cat_id,$query,$action,$action_id,
!
$ordermethod,&$start,&$total)
{
return
$this->so->readIdArray($order,$sort,$filter,$cat_id,$query,
!
$action,$action_id,$ordermethod,$start,$total);
}
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.soinfolog.inc.php 4 Oct 2001 19:04:58 -0000 1.10
--- class.soinfolog.inc.php 1 May 2002 17:16:27 -0000 1.11
***************
*** 233,238 ****
}
! function
readIdArray($order,$sort,$filter,$cat_id,$query,$action,$addr_id,
!
$proj_id,$info_id,$ordermethod,&$start,&$total)
{
if ($order)
--- 233,238 ----
}
! function
readIdArray($order,$sort,$filter,$cat_id,$query,$action,$action_id,
!
$ordermethod,&$start,&$total)
{
if ($order)
***************
*** 255,261 ****
switch ($action)
{
! case 'addr': $filtermethod .= " AND
info_addr_id=$addr_id ";
break;
! case 'proj': $filtermethod .= " AND
info_proj_id=$proj_id ";
break;
}
--- 255,261 ----
switch ($action)
{
! case 'addr': $filtermethod .= " AND
info_addr_id=$action_id ";
break;
! case 'proj': $filtermethod .= " AND
info_proj_id=$action_id ";
break;
}
***************
*** 265,269 ****
"like
'%$query%' OR info_des like '%$query%') ";
}
! $pid = 'AND info_id_parent='.($action == 'sp' ?
$info_id : 0);
if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
--- 265,269 ----
"like
'%$query%' OR info_des like '%$query%') ";
}
! $pid = 'AND info_id_parent='.($action == 'sp' ?
$action_id : 0);
if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.uiinfolog.inc.php 30 Apr 2002 17:26:40 -0000 1.32
--- class.uiinfolog.inc.php 1 May 2002 17:16:27 -0000 1.33
***************
*** 305,312 ****
}
! function get_list($for_include=0)
{
global
$cat_filter,$cat_id,$sort,$order,$query,$start,$filter;
- global $action,$addr_id,$proj_id,$info_id;
if (!$for_include)
--- 305,311 ----
}
! function get_list($for_include=0,$action='',$action_id=0)
{
global
$cat_filter,$cat_id,$sort,$order,$query,$start,$filter;
if (!$for_include)
***************
*** 315,318 ****
--- 314,322 ----
echo parse_navbar();
}
+ if ($action == '')
+ {
+ $action = get_var('action',array('GET','POST'));
+ $action_id =
get_var('action_id',array('GET','POST'));
+ }
$t = $this->template; $html = $this->html;
***************
*** 339,356 ****
{
case 'sp': // Sub-List
! $action_vars =
array('action'=>'sp','info_id'=>$info_id);
$t->set_var(lang_info_action,lang('InfoLog - Subprojects from'));
break;
case 'proj':
! $action_vars += array( 'id_project' =>
$proj_id,
!
'proj_id' => $proj_id);
! $proj = $this->bo->readProj($proj_id);
$t->set_var(lang_info_action,lang('InfoLog').' - '.
$proj['title']);
break;
case 'addr':
! $action_vars += array( 'id_addr' =>
$addr_id,
!
'addr_id' => $addr_id );
! $addr = $this->bo->readAddr($addr_id);
$t->set_var(lang_info_action,lang('InfoLog').' - '.
$this->bo->addr2name($addr));
--- 343,360 ----
{
case 'sp': // Sub-List
! $action_vars =
array('action'=>'sp','info_id'=>$action_id);
$t->set_var(lang_info_action,lang('InfoLog - Subprojects from'));
break;
case 'proj':
! $action_vars += array( 'id_project' =>
$action_id,
!
'proj_id' => $action_id);
! $proj = $this->bo->readProj($action_id);
$t->set_var(lang_info_action,lang('InfoLog').' - '.
$proj['title']);
break;
case 'addr':
! $action_vars += array( 'id_addr' =>
$action_id,
!
'addr_id' => $action_id );
! $addr = $this->bo->readAddr($action_id);
$t->set_var(lang_info_action,lang('InfoLog').' - '.
$this->bo->addr2name($addr));
***************
*** 395,400 ****
$ids =
$this->bo->readIdArray($order,$sort,$filter,$cat_id,$query,
!
$action,$addr_id,$proj_id,$info_id,
!
$ordermethod,$start,$total);
$maxmatchs =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 399,403 ----
$ids =
$this->bo->readIdArray($order,$sort,$filter,$cat_id,$query,
!
$action,$action_id,$ordermethod,$start,$total);
$maxmatchs =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
***************
*** 421,432 ****
case 'sp': // details of parent
$t->set_var( $this->infoHeaders( ));
! $t->set_var( $this->formatInfo(
$info_id ));
$t->parse('projdetailshandle','projdetails',True);
break;
case 'addr':
! $nm_extra = "&addr_id=$addr_id";
break;
case 'proj':
! $nm_extra = "&proj_id=$proj_id";
break;
}
--- 424,435 ----
case 'sp': // details of parent
$t->set_var( $this->infoHeaders( ));
! $t->set_var( $this->formatInfo(
$action_id ));
$t->parse('projdetailshandle','projdetails',True);
break;
case 'addr':
! $nm_extra = "&action_id=$action_id";
break;
case 'proj':
! $nm_extra = "&action_id=$action_id";
break;
}
***************
*** 504,508 ****
$t->set_var('viewsub', $html->a_href(
$this->icon('action','view'),'/index.php',
! $this->menuaction()+array(
'info_id' => $id,
'filter' => $filter, 'action'
=> 'sp')));
}
--- 507,511 ----
$t->set_var('viewsub', $html->a_href(
$this->icon('action','view'),'/index.php',
! $this->menuaction()+array(
'action_id' => $id,
'filter' => $filter, 'action'
=> 'sp')));
}
***************
*** 523,527 ****
$this->icon('action','parent'),'/index.php',
$this->menuaction()+
! array('info_id' => $parent,
'filter' =>
$filter,'action' => 'sp')));
}
--- 526,530 ----
$this->icon('action','parent'),'/index.php',
$this->menuaction()+
! array('action_id' => $parent,
'filter' =>
$filter,'action' => 'sp')));
}
Index: hook_addressbook_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_addressbook_view.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hook_addressbook_view.inc.php 25 Sep 2001 22:45:05 -0000 1.4
--- hook_addressbook_view.inc.php 1 May 2002 17:16:27 -0000 1.5
***************
*** 19,25 ****
/* echo "<p>hook_addressbook_view(ab_id=$ab_id)</p>"; */
- $GLOBALS['addr_id'] = $GLOBALS['ab_id']; $GLOBALS['action'] = 'addr';
$infolog = CreateObject('infolog.uiinfolog');
! $infolog->get_list(True);
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
--- 19,24 ----
/* echo "<p>hook_addressbook_view(ab_id=$ab_id)</p>"; */
$infolog = CreateObject('infolog.uiinfolog');
! $infolog->get_list(True,'addr',$GLOBALS['ab_id']);
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
Index: hook_projects_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_projects_view.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hook_projects_view.inc.php 14 Jul 2001 00:55:12 -0000 1.1
--- hook_projects_view.inc.php 1 May 2002 17:16:27 -0000 1.2
***************
*** 18,28 ****
$phpgw->translation->add_app('infolog');
- global $id;
//echo "<p>hook_projects_view(id=$id)</p>";
- global $proj_id,$action;
- $proj_id = $id; $action='proj';
$infolog = CreateObject('infolog.uiinfolog');
! $infolog->get_list(True);
$phpgw_info['flags']['currentapp'] = $save_app;
--- 18,25 ----
$phpgw->translation->add_app('infolog');
//echo "<p>hook_projects_view(id=$id)</p>";
$infolog = CreateObject('infolog.uiinfolog');
! $infolog->get_list(True,'proj',$GLOBALS['id']);
$phpgw_info['flags']['currentapp'] = $save_app;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.15,1.16 class.soinfolog.inc.php,1.10,1.11 class.uiinfolog.inc.php,1.32,1.33 hook_addressbook_view.inc.php,1.4,1.5 hook_projects_view.inc.php,1.1,1.2,
Ralf Becker <address@hidden> <=