[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.14.2.1,1.1
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.14.2.1,1.14.2.2 class.sbox2.inc.php,1.1.2.2,1.1.2.3 class.uiinfolog.inc.php,1.30.2.4,1.30.2.5 hook_projects_view.inc.php,1.1,1.1.2.1 |
|
Date: |
Sun, 01 Sep 2002 13:46:18 -0400 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv15278
Modified Files:
Tag: Version-0_9_14-branch
class.boinfolog.inc.php class.sbox2.inc.php
class.uiinfolog.inc.php hook_projects_view.inc.php
Log Message:
get infolog to work with (new 3-tier) projects
Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** class.boinfolog.inc.php 20 Feb 2002 17:00:51 -0000 1.14.2.1
--- class.boinfolog.inc.php 1 Sep 2002 17:46:13 -0000 1.14.2.2
***************
*** 139,143 ****
$this->projects =
createobject('projects.boprojects');
}
! if (is_object($this->projects) && (list( $proj
) = $this->projects->read_single_project( $proj_id)))
{
return $proj;
--- 139,143 ----
$this->projects =
createobject('projects.boprojects');
}
! if (is_object($this->projects) && ($proj =
$this->projects->read_single_project( $proj_id)))
{
return $proj;
Index: class.sbox2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.sbox2.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.sbox2.inc.php 31 May 2002 20:26:31 -0000 1.1.2.2
--- class.sbox2.inc.php 1 Sep 2002 17:46:13 -0000 1.1.2.3
***************
*** 282,291 ****
while ($projs && list( $key,$proj ) =
each( $projs ))
{
! $content[$proj['id']] =
$proj['title'];
}
}
else
{
! list( $proj ) =
$projects->read_single_project( $id_name );
if (count($proj))
{
--- 282,291 ----
while ($projs && list( $key,$proj ) =
each( $projs ))
{
! $content[$proj['project_id']] =
$proj['title'];
}
}
else
{
! $proj = $projects->read_single_project(
$id_name );
if (count($proj))
{
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.5
diff -C2 -r1.30.2.4 -r1.30.2.5
*** class.uiinfolog.inc.php 14 May 2002 13:21:48 -0000 1.30.2.4
--- class.uiinfolog.inc.php 1 Sep 2002 17:46:13 -0000 1.30.2.5
***************
*** 131,138 ****
$proj = $this->bo->readProj($proj_id))
{
! $subject .=
$this->html->bold($this->html->a_href($proj['title'],
!
'/index.php',$this->menuaction()+
! array(
'filter' => $filter,'action' => 'proj',
!
'proj_id' => $proj_id )));
}
if ($a_id != ($addr_id = $info['info_addr_id']) &&
--- 131,141 ----
$proj = $this->bo->readProj($proj_id))
{
! $subject .=
$this->html->bold($this->html->a_href($proj['title'],'/index.php',array(
! 'menuaction' =>
'projects.uiprojects.view_project',
! 'action' => 'mains',
! 'project_id' => $proj_id
! )
! //$this->menuaction()+array( 'filter' =>
$filter,'action' => 'proj','proj_id' => $proj_id )
! ));
}
if ($a_id != ($addr_id = $info['info_addr_id']) &&
***************
*** 141,150 ****
if ($proj) $subject .= '<br>';
$addr = $this->bo->addr2name( $addr );
! $subject .=
$this->html->bold($this->html->a_href($addr,'/index.php',
! array(
'menuaction' => 'addressbook.uiaddressbook.view',
!
'ab_id' => $addr_id)
! /*
$this->menuaction() + array( 'filter' => $filter,'action' => 'addr',
!
'addr_id' => $addr_id )*/
! ));
}
if (($from = $info['info_from']) && (!$addr ||
!strstr($addr,$from)))
--- 144,153 ----
if ($proj) $subject .= '<br>';
$addr = $this->bo->addr2name( $addr );
! $subject .=
$this->html->bold($this->html->a_href($addr,'/index.php',array(
! 'menuaction' =>
'addressbook.uiaddressbook.view',
! 'ab_id' => $addr_id
! )
! // $this->menuaction() + array( 'filter' =>
$filter,'action' => 'addr', 'addr_id' => $addr_id )
! ));
}
if (($from = $info['info_from']) && (!$addr ||
!strstr($addr,$from)))
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.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** hook_projects_view.inc.php 14 Jul 2001 00:55:12 -0000 1.1
--- hook_projects_view.inc.php 1 Sep 2002 17:46:13 -0000 1.1.2.1
***************
*** 18,26 ****
$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);
--- 18,26 ----
$phpgw->translation->add_app('infolog');
! global $project_id;
! //echo "<p>hook_projects_view(id=$project_id)</p>";
global $proj_id,$action;
! $proj_id = $project_id; $action='proj';
$infolog = CreateObject('infolog.uiinfolog');
$infolog->get_list(True);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.14.2.1,1.14.2.2 class.sbox2.inc.php,1.1.2.2,1.1.2.3 class.uiinfolog.inc.php,1.30.2.4,1.30.2.5 hook_projects_view.inc.php,1.1,1.1.2.1,
Ralf Becker <address@hidden> <=