[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.23,1.24 cl
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.23,1.24 class.soinfolog.inc.php,1.14,1.15 class.uiinfolog.inc.php,1.47,1.48 |
|
Date: |
Sun, 13 Oct 2002 20:39:49 -0400 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv23084
Modified Files:
class.boinfolog.inc.php class.soinfolog.inc.php
class.uiinfolog.inc.php
Log Message:
lots of fixes and additions:
- load_via works now in boetemplate::read
- included templates are relative to the includeing tpl, if they contain no '.'
- xul_io is alway writing the comple/absolute name
- HBox gets width=100% if alignment other then left set (new!)
- added links as 2. option to label
- added header function to uietemplate
Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.boinfolog.inc.php 8 Oct 2002 00:10:02 -0000 1.23
--- class.boinfolog.inc.php 14 Oct 2002 00:39:47 -0000 1.24
***************
*** 27,30 ****
--- 27,31 ----
'anzSubs' => True,
'readIdArray' => True,
+ 'get_rows' => True,
'accountInfo' => True, // in class boinfolog
(this class)
'addr2name' => True,
***************
*** 230,234 ****
function read($info_id)
{
! $this->so->read($info_id);
if ($this->so->data['info_subject'] ==
--- 231,235 ----
function read($info_id)
{
! $err = $this->so->read($info_id) === False;
if ($this->so->data['info_subject'] ==
***************
*** 242,246 ****
$this->so->data['info_from'] = '';
}
! return $this->so->data;
}
--- 243,247 ----
$this->so->data['info_from'] = '';
}
! return $err ? False : $this->so->data;
}
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.soinfolog.inc.php 8 Oct 2002 00:10:02 -0000 1.14
--- class.soinfolog.inc.php 14 Oct 2002 00:39:47 -0000 1.15
***************
*** 266,280 ****
//echo
"<p>soinfolog.readIdArray(action='$action',action_id='$action_id')</p>\n";
$action2app = array(
! 'addr' => 'addressbook',
! 'proj' => 'projects',
! 'event' => 'calendar'
);
! if ($action != '' && $action2app[$action] != '')
{
$links =
$this->links->get_links($action2app[$action],$action_id);
$ids = array();
! while (list($nul,$link) = each($links))
{
! $ids[''.$link['id']] = 0;
}
//echo
"<p>soinfolog.readIdArray($action,$action_id) ids ="; _debug_array($ids);
--- 266,292 ----
//echo
"<p>soinfolog.readIdArray(action='$action',action_id='$action_id')</p>\n";
$action2app = array(
! 'addr' => 'addressbook',
! 'addressbook' => 'addressbook',
! 'proj' => 'projects',
! 'projects' => 'projects',
! 'event' => 'calendar',
! 'calendar' => 'calendar'
);
! if ($action != '' && isset($action2app[$action]))
{
$links =
$this->links->get_links($action2app[$action],$action_id);
+ $total = count($links);
+ if ($start > $total)
+ {
+ $start = 0;
+ }
$ids = array();
! while (list($n,$link) = each($links) &&
! $n <
$start+$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
{
! if ($n >= $start)
! {
! $ids[''.$link['id']] = 0;
! }
}
//echo
"<p>soinfolog.readIdArray($action,$action_id) ids ="; _debug_array($ids);
***************
*** 283,291 ****
if ($order)
{
! $ordermethod = 'order by ' . $order . ' ' . $sort;
}
else
{
! $ordermethod = 'order by info_datemodified desc';
// newest first
}
$filtermethod = $this->aclFilter($filter);
--- 295,303 ----
if ($order)
{
! $ordermethod = 'ORDER BY ' . $order . ' ' . $sort;
}
else
{
! $ordermethod = 'ORDER BY info_datemodified DESC';
// newest first
}
$filtermethod = $this->aclFilter($filter);
***************
*** 298,301 ****
--- 310,314 ----
$filtermethod .= " AND info_cat='$cat_id' ";
}
+ /* not longer used
switch ($action)
{
***************
*** 307,314 ****
break;
}
if ($query) // we search in
_from, _subject and _des for $query
{
$sql_query = "AND (info_from like '%$query%' OR
info_subject ".
! "like
'%$query%' OR info_des like '%$query%') ";
}
$pid = 'AND info_id_parent='.($action == 'sp' ?
$action_id : 0);
--- 320,328 ----
break;
}
+ */
if ($query) // we search in
_from, _subject and _des for $query
{
$sql_query = "AND (info_from like '%$query%' OR
info_subject ".
! "LIKE
'%$query%' OR info_des LIKE '%$query%') ";
}
$pid = 'AND info_id_parent='.($action == 'sp' ?
$action_id : 0);
***************
*** 328,333 ****
$start = 0;
}
! $this->db->limit_query("SELECT info_id,info_id_parent
FROM phpgw_infolog WHERE $filtermethod $pid $sql_query
$ordermethod",$start,__LINE__,__FILE__);
!
$ids = array( );
while ($this->db->next_record())
--- 342,347 ----
$start = 0;
}
! $this->db->limit_query($sql="SELECT
info_id,info_id_parent FROM phpgw_infolog WHERE $filtermethod $pid $sql_query
$ordermethod",$start,__LINE__,__FILE__);
!
$ids = array( );
while ($this->db->next_record())
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** class.uiinfolog.inc.php 9 Oct 2002 11:45:50 -0000 1.47
--- class.uiinfolog.inc.php 14 Oct 2002 00:39:47 -0000 1.48
***************
*** 18,22 ****
var $public_functions = array
(
! 'get_list' => True,
'index' => True,
'edit' => True,
--- 18,22 ----
var $public_functions = array
(
! //'get_list' => True,
'index' => True,
'edit' => True,
***************
*** 25,29 ****
'add_file' => True,
'admin' => True,
! 'preferences' => True
);
var $icons;
--- 25,30 ----
'add_file' => True,
'admin' => True,
! 'preferences' => True,
! 'writeLangFile' => True
);
var $icons;
***************
*** 72,83 ****
'edit' => 'InfoLog - Edit',
'add' => 'InfoLog - New',
! 'add_sub' => 'InfoLog - New Subproject'
);
! $this->html = CreateObject('etemplate.html');
! $this->categories = CreateObject('phpgwapi.categories');
! $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
$this->link = CreateObject('infolog.uilink');
$this->tmpl = CreateObject('etemplate.etemplate');
}
--- 73,362 ----
'edit' => 'InfoLog - Edit',
'add' => 'InfoLog - New',
! 'add_sub' => 'InfoLog - New Subproject',
! 'sp' => '- Subprojects from',
! 're' => 'Re:'
);
! //$this->html = CreateObject('etemplate.html');
! //$this->categories =
CreateObject('phpgwapi.categories');
! //$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->link = CreateObject('infolog.uilink');
$this->tmpl = CreateObject('etemplate.etemplate');
+ $this->html = &$this->tmpl->html;
+ }
+
+ function get_info($id,&$readonlys,$action='',$action_id='')
+ {
+ $info = $this->bo->read($id);
+ $info['anzSubs'] = $this->bo->anzSubs($id);
+ $info += $this->formatInfo($info,$action,$action_id);
+
+ $readonlys["edit[$id]"] =
!$this->bo->check_access($id,PHPGW_ACL_EDIT);
+ $readonlys["delete[$id]"] =
!$this->bo->check_access($id,PHPGW_ACL_DELETE);
+ $readonlys["sp[$id]"] =
!$this->bo->check_access($id,PHPGW_ACL_ADD);
+ $readonlys["view[$id]"] = $info['anzSubs'] < 1;
+ $readonlys['view[0]'] = True; // no parent
+
+ return $info;
+ }
+
+ function get_rows($query,&$rows,&$readonlys)
+ {
+ //echo
"<p>uiinfolog.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]')</p>\n";
+
+ $ids =
$this->bo->readIdArray($query['order'],$query['sort'],$query['filter'],$query['cat_id'],
+
$query['search'],$query['action'],$query['action_id'],$query['ordermethod'],
+ $query['start'],$total);
+
+ if (!is_array($ids))
+ {
+ $ids = array( );
+ }
+ $rows = array( $total );
+ $readonlys = array();
+ while (list($id,$parent) = each($ids))
+ {
+ $rows[] =
$this->get_info($id,$readonlys,$query['action'],$query['action_id']);
+ }
+ //echo "<p>readonlys = "; _debug_array($readonlys);
+ reset($rows);
+
+ return $total;
+ }
+
+ function delete($values=0,$referer='')
+ {
+ $info_id = is_array($values) ? $values['info_id'] :
$values;
+ $referer = is_array($values) ? $values['referer'] :
$referer;
+
+ if (is_array($values) || $info_id <= 0)
+ {
+ if ($values['delete'] && $info_id > 0 &&
$this->bo->check_access($info_id,PHPGW_ACL_DELETE))
+ {
+ $this->bo->delete($info_id);
+ }
+ return $referer ? $this->tmpl->header($referer)
: $this->index();
+ }
+ $readonlys = $values = array();
+ $values['main'][1] =
$this->get_info($info_id,&$readonlys['main']);
+
+ $this->tmpl->read('infolog.delete');
+
+ $values['main']['no_actions'] = True;
+ $persist['info_id'] = $info_id;
+ $persist['referer'] = $referer;
+
+
$this->tmpl->exec('infolog.uiinfolog.delete',$values,'',$readonlys,$persist);
+ }
+
+ function index($values = 0,$action='',$action_id='',$referer=0)
+ {
+ $referer = is_array($values) ? $values['referer'] :
$referer;
+ if (!is_array($values))
+ {
+ $values = array('nm' =>
$GLOBALS['phpgw']->session->appsession('session_data','infolog'));
+ }
+ $action = $action ? $action : $values['nm']['action'];
+ $action_id = $action_id ? $action_id :
$values['nm']['action_id'];
+
+ if ($values['add'] || $values['cancel'] ||
isset($values['nm']['rows']) || isset($values['main']))
+ {
+ $data = $values['nm'];
+ unset($data['rows']);
+
$GLOBALS['phpgw']->session->appsession('session_data','infolog',$data);
+
+ if ($values['add'])
+ {
+ list($type) = each($values['add']);
+ return
$this->edit(0,$values['nm']['action'],$values['nm']['action_id'],$type,$referer);
+ }
+ else
+ {
+ list($action,$action_id) =
isset($values['main']) ? each($values['main']) : @each($values['nm']['rows']);
+ list($action_id) = @each($action_id);
+ //echo "<p>infolog::index:
action='$action', id='$action_id'</p>\n";
+ switch($action)
+ {
+ case 'edit':
+ return
$this->edit($action_id,'','','',$referer);
+ case 'delete':
+ return
$this->delete($action_id,$referer);
+ case 'sp':
+ return
$this->edit(0,$action,$action_id,'',$referer);
+ case 'view':
+ $value = array();
+ $action = 'sp';
+ break;
+ default:
+ $value = array();
+ $action = '';
+ $action_id = 0;
+ break;
+ }
+ }
+ }
+ switch ($action)
+ {
+ case 'sp':
+ if (!$this->bo->read($action_id))
+ {
+ $action = '';
+ $action_id = 0;
+ break;
+ }
+ $values['main'][1] =
$this->get_info($action_id,&$readonlys['main']);
+ $values['appheader'] =
$this->messages['sp'];
+ break;
+ }
+ $readonlys['cancel'] = $action != 'sp';
+
+ $this->tmpl->read('infolog.index');
+
+ $values['nm']['options-filter'] = $this->filters;
+ $values['nm']['get_rows'] =
'infolog.uiinfolog.get_rows';
+ $values['nm']['no_filter2'] = True;
+ $persist['nm']['action'] = $values['nm']['action'] =
$action;
+ $persist['nm']['action_id'] =
$values['nm']['action_id'] = $action_id;
+ $persist['referer'] = $referer;
+
+
$GLOBALS['phpgw']->session->appsession('session_data','infolog',$values['nm']);
+
+
$this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist);
+ }
+
+ /*!
+ @function edit
+ @syntax edit( $content=0,$action='',$action_id=0,$type='' )
+ @author ralfbecker
+ @abstract Edit/Create an InfoLog Entry
+ @param $content Content from the eTemplate Exec call or
info_id on inital call
+ @param $action Name of an app of 'sp' for a infolog-sub
+ @param $action_id Id of app-entry to which a link is created
+ @param $type Type of log-entry: note,todo,task
+ */
+ function edit($content = 0,$action =
'',$action_id=0,$type='',$referer='')
+ {
+ $referer = is_array($content) ? $content['referer'] :
$referer;
+
+ if (is_array($values) || $info_id < 0)
+ {
+ if ($values['delete'] && $info_id > 0 &&
$this->bo->check_access($info_id,PHPGW_ACL_DELETE))
+ {
+ $this->bo->delete($info_id);
+ }
+ return $referer ? $this->tmpl->header($referer)
: $this->index();
+ }
+ if (is_array($content))
+ {
+ $info_id = $content['info_id'];
+ $action = $content['action'];
+ $action_id = $content['action_id'];
+
+ if ($content['save'] || $content['delete'] ||
$content['cancel'])
+ {
+ if ($content['save'] && (!$info_id ||
$this->bo->check_access($info_id,PHPGW_ACL_EDIT)))
+ {
+ $this->bo->write($content);
+
+ if (!$info_id &&
is_array($content['link_to']['to_id']))
+ {
+
$this->link->link('infolog',$this->bo->so->data['info_id'],$content['link_to']['to_id']);
+ }
+ }
+ elseif ($content['delete'] && $info_id
> 0)
+ {
+ return
$this->delete($info_id,$referer); // checks ACL first
+ }
+ return $referer ?
$this->tmpl->header($referer) : $this->index();
+ }
+ }
+ else
+ {
+ //echo "<p>uiinfolog::edit: info_id=$info_id,
action='$action', action_id='$action_id', type='$type',
referer='$referer'</p>\n";
+ $action = $action ? $action :
get_var('action', array('POST','GET'));
+ $action_id = $action_id ? $action_id :
get_var('action_id',array('POST','GET'));
+ $info_id = $content ? $content :
get_var('info_id', array('POST','GET'));
+ $type = $type ? $type :
get_var('type', array('POST','GET'));
+ $referer = ''.$referer != '' ? $referer :
get_var('HTTP_REFERER','SERVER');
+ //echo "<p>uiinfolog::edit: info_id=$info_id,
action='$action', action_id='$action_id', type='$type',
referer='$referer'</p>\n";
+
+ if (!isset($this->bo->enums['type'][$type]))
+ {
+ $type = 'note';
+ }
+ $this->bo->read( $action == 'sp' && $action_id
> 0 ? $action_id : $info_id );
+ $content = $this->bo->so->data;
+
+ if ($action_id && $action == 'sp') // new
SubProject
+ {
+ if
(!$this->bo->check_access($action_id,PHPGW_ACL_ADD))
+ {
+ return $referer ?
$this->tmpl->header($referer) : $this->index();
+ }
+ $parent = $this->bo->so->data;
+ $content['info_id'] = $info_id = 0;
+ $content['info_owner'] =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $content['info_id_parent'] =
$parent['info_id'];
+ /*
+ if ($parent['info_type']=='task' &&
$parent['info_status']=='offer')
+ {
+ $content['info_type'] =
'confirm'; // confirmation to parent
+ $content['info_responsible'] =
$parent['info_owner'];
+ }
+ */
+ $content['info_status'] = 'ongoing';
+ $content['info_confirm'] = 'not';
+
$content['info_subject']=lang($this->messages['re']).'
'.$parent['info_subject'];
+ $content['info_des'] = '';
+ $content['info_lastmodified'] = '';
+ }
+ else
+ {
+ if ($info_id &&
!$this->bo->check_access($info_id,PHPGW_ACL_EDIT))
+ {
+ return $referer ?
$this->tmpl->header($referer) : $this->index();
+ }
+ }
+ $content['links'] = $content['link_to'] = array(
+ 'to_id' => $info_id,
+ 'to_app' => 'infolog'
+ );
+ switch ($action)
+ {
+ case 'sp':
+ break;
+ case 'addressbook':
+ case 'projects':
+ case 'calendar':
+
$this->link->link('infolog',$content['link_to']['to_id'],$action,$action_id);
+ case 'new':
+ $content['info_type'] = $type;
+ break;
+ default:
+ $action = '';
+ break;
+ }
+ if
(!isset($this->bo->enums['type'][$content['info_type']]))
+ {
+ $content['info_type'] = 'note';
+ }
+ }
+ $readonlys['delete'] = $action != '';
+ $content['appheader'] = $this->messages[$action ?
($action == 'sp' ? 'add_sub' : 'add') : 'edit'];
+
+ //echo "<p>uiinfolog.edit(info_id=$info_id,mode=$mode)
content = "; _debug_array($content);
+ $this->tmpl->read('infolog.edit');
+
$this->tmpl->exec('infolog.uiinfolog.edit',$content,array(
+ 'info_type' => $this->bo->enums['type'],
+ 'info_pri' => $this->bo->enums['priority'],
+ 'info_confirm' => $this->bo->enums['confirm'],
+ 'info_status' =>
$this->bo->status[$content['info_type']]
+ ),$readonlys,array(
+ 'info_id' => $info_id,
+ 'info_id_parent' => $content['info_id_parent'],
+ 'action' => $action,
+ 'action_id' => $action_id,
+ 'referer' => $referer
+ ));
}
***************
*** 132,136 ****
$css_class = $info['info_pri'].($done ? '_done' : '');
$subject = "<span class=$css_class>";
!
if (($action_id != ($proj_id = $info['info_proj_id'])
|| $action != 'proj') &&
$proj = $this->bo->readProj($proj_id))
--- 411,415 ----
$css_class = $info['info_pri'].($done ? '_done' : '');
$subject = "<span class=$css_class>";
! /*
if (($action_id != ($proj_id = $info['info_proj_id'])
|| $action != 'proj') &&
$proj = $this->bo->readProj($proj_id))
***************
*** 185,189 ****
)
));
! }
if (($from = $info['info_from']) && (!$addr ||
!strstr($addr,$from)))
{
--- 464,468 ----
)
));
! } */
if (($from = $info['info_from']) && (!$addr ||
!strstr($addr,$from)))
{
***************
*** 233,237 ****
$owner = "<span class=private>$owner</span>";
}
!
// add the links to the files which corrospond to this
entry
$attachments =
$this->bo->list_attached($info['info_id']);
--- 512,516 ----
$owner = "<span class=private>$owner</span>";
}
! /*
// add the links to the files which corrospond to this
entry
$attachments =
$this->bo->list_attached($info['info_id']);
***************
*** 246,250 ****
if ($comment) $links .= ' (' . $comment . ')';
}
!
return array(
'type' =>
$this->icon('type',$info['info_type']),
--- 525,529 ----
if ($comment) $links .= ' (' . $comment . ')';
}
! */
return array(
'type' =>
$this->icon('type',$info['info_type']),
***************
*** 696,828 ****
}
- function index()
- {
- $this->get_list();
- }
-
- /*!
- @function edit
- @syntax edit( $content=0,$action='',$action_id=0,$type='' )
- @author ralfbecker
- @abstract Edit/Create an InfoLog Entry
- @param $content Content from the eTemplate Exec call or
info_id on inital call
- @param $action Name of an app of 'sp' for a infolog-sub
- @param $action_id Id of app-entry to which a link is created
- @param $type Type of log-entry: note,todo,task
- */
- function edit($content = 0,$action = '',$action_id=0,$type='')
- {
- if (is_array($content))
- {
- $info_id = $content['info_id'];
- $action = $content['action'];
- $action_id = $content['action_id'];
-
- if ($content['save'] || $content['delete'] ||
$content['cancel'])
- {
- if ($content['save'] && (!$info_id ||
$this->bo->check_access($info_id,PHPGW_ACL_EDIT)))
- {
- $this->bo->write($content);
-
- if (!$info_id &&
is_array($content['link_to']['to_id']))
- {
-
$this->link->link('infolog',$this->bo->so->data['info_id'],$content['link_to']['to_id']);
- }
- }
- elseif ($content['delete'] && $info_id
> 0 && $this->bo->check_access($info_id,PHPGW_ACL_DELETE))
- {
- return $this->delete($info_id);
- }
- return $this->index();
- }
- }
- else
- {
- $action = $action ? $action :
get_var('action', array('POST','GET'));
- $action_id = $action_id ? $action_id :
get_var('action_id',array('POST','GET'));
- $info_id = $content ? $content :
get_var('info_id', array('POST','GET'));
- $type = $type ? $type :
get_var('type', array('POST','GET'));
- if (!isset($this->bo->enums['type'][$type]))
- {
- $type = 'note';
- }
- $this->bo->read( $info_id );
- $content = $this->bo->so->data;
-
- if ($info_id && $action == 'sp') // new
SubProject
- {
- if
(!$this->bo->check_access($info_id,PHPGW_ACL_ADD))
- {
- return $this->index();
- Header('Location: ' .
$this->html->link($referer));
-
$GLOBALS['phpgw']->common->phpgw_exit();
- }
- $parent = $this->bo->so->data;
- $content['info_id'] = $info_id = 0;
- $content['info_owner'] =
$GLOBALS['phpgw_info']['user']['account_id'];
- $content['info_id_parent'] =
$parent['info_id'];
- /*
- if ($parent['info_type']=='task' &&
$parent['info_status']=='offer')
- {
- $content['info_type'] =
'confirm'; // confirmation to parent
- $content['info_responsible'] =
$parent['info_owner'];
- }
- */
- $content['info_status'] = 'ongoing';
- $content['info_confirm'] = 'not';
- $content['info_subject']=lang('Re:').'
'.$parent['info_subject'];
- $content['info_des'] = '';
- $content['info_lastmodified'] = '';
- }
- else
- {
- if ($info_id &&
!$this->bo->check_access($info_id,PHPGW_ACL_EDIT))
- {
- return $this->index();
- Header('Location: ' .
$this->html->link($referer));
-
$GLOBALS['phpgw']->common->phpgw_exit();
- }
- }
- $content['links'] = $content['link_to'] = array(
- 'to_id' => $info_id,
- 'to_app' => 'infolog'
- );
- switch ($action)
- {
- case 'sp':
- break;
- case 'addressbook':
- case 'projects':
- case 'calendar':
-
$this->link->link('infolog',$content['link_to']['to_id'],$action,$action_id);
- case 'new':
- $content['info_type'] = $type;
- break;
- default:
- $action = '';
- break;
- }
- if
(!isset($this->bo->enums['type'][$content['info_type']]))
- {
- $content['info_type'] = 'note';
- }
- }
- $readonlys['delete'] = $action != '';
- $content['appheader'] = $this->messages[$action ?
($action == 'sp' ? 'add_sub' : 'add') : 'edit'];
-
- //echo "<p>uiinfolog.edit(info_id=$info_id,mode=$mode)
content = "; _debug_array($content);
- $this->tmpl->read('infolog.edit');
-
$this->tmpl->exec('infolog.uiinfolog.edit',$content,array(
- 'info_type' => $this->bo->enums['type'],
- 'info_pri' => $this->bo->enums['priority'],
- 'info_confirm' => $this->bo->enums['confirm'],
- 'info_status' =>
$this->bo->status[$content['info_type']]
- ),$readonlys,array(
- 'info_id' => $info_id,
- 'action' => $action,
- 'action_id' => $action_id
- ));
- }
-
function old_edit( )
{
--- 975,978 ----
***************
*** 1155,1159 ****
}
! function delete( $id=0 )
{
global $info_id,$confirm,$to_del;
--- 1305,1309 ----
}
! function old_delete( $id=0 )
{
global $info_id,$confirm,$to_del;
***************
*** 1362,1368 ****
function writeLangFile()
{
! $il = new uiinfolog(False); // no lang on messages
!
!
$this->tmpl->writeLangFile('et_media','en',$il->messages);
}
}
--- 1512,1516 ----
function writeLangFile()
{
!
$this->tmpl->writeLangFile('infolog','en',$this->messages);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.23,1.24 class.soinfolog.inc.php,1.14,1.15 class.uiinfolog.inc.php,1.47,1.48,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: etemplate/templates/default editor.cell.vbox.xet,1.1,1.2 editor.xet,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: infolog/setup etemplates.inc.php,1.6,1.7 phpgw_en.lang,1.18,1.19
- Previous by thread:
[Phpgroupware-cvs] CVS: etemplate/templates/default editor.cell.vbox.xet,1.1,1.2 editor.xet,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: infolog/setup etemplates.inc.php,1.6,1.7 phpgw_en.lang,1.18,1.19
- Index(es):