[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] infolog/inc class.uilink.inc.php, 1.8 class.uiinfolog
|
From: |
powerstat |
|
Subject: |
[Phpgroupware-cvs] infolog/inc class.uilink.inc.php, 1.8 class.uiinfolog.inc.php, 1.78 class.soinfolog.inc.php, 1.25 class.boinfolog.inc.php, 1.42 |
|
Date: |
Wed, 4 May 2005 16:19:00 +0200 |
Update of infolog/inc
Modified Files:
Branch: MAIN
class.uilink.inc.php lines: +171 -171
class.uiinfolog.inc.php lines: +3 -3
class.soinfolog.inc.php lines: +2 -2
class.boinfolog.inc.php lines: +2 -2
Log Message:
Fixes deprecated (since 2003) call by reference functions calls. All function
declarations were already correct.
====================================================
Index: infolog/inc/class.uilink.inc.php
diff -u infolog/inc/class.uilink.inc.php:1.7
infolog/inc/class.uilink.inc.php:1.8
--- infolog/inc/class.uilink.inc.php:1.7 Wed Jan 5 22:07:58 2005
+++ infolog/inc/class.uilink.inc.php Wed May 4 14:19:07 2005
@@ -1,171 +1,171 @@
-<?php
- /**********************************************************************\
- * phpGroupWare - InfoLog *
- * http://www.phpgroupware.org *
- * This program is part of the GNU project, see http://www.gnu.org/ *
- * *
- * Copyright 2002, 2003 Free Software Foundation, Inc. *
- * *
- * Originally Written by Ralf Becker - <address@hidden> *
- * Based on ToDo Written by Joseph Engo <jengo at phpgroupware.org> *
- * --------------------------------------------
*
- * This program is Free Software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * at your option) any later version. *
- \**********************************************************************/
- /* $Id$ */
-
- include_once(PHPGW_INCLUDE_ROOT . '/infolog/inc/class.bolink.inc.php');
-
- /*!
- @class uilink
- @author ralfbecker
- @abstract generalized linking between entries of phpGroupware apps -
HTML UI layer
- @discussion This class is the UI to show/modify the links
- @discussion Links have to ends each pointing to an entry, an entry is a
double:
- @discussion app app-name or directory-name of an phpgw application,
eg. 'infolog'
- @discussion id this is the id, eg. an integer or a tupple like
'0:INBOX:1234'
- */
- class uilink extends bolink
- {
- function uilink( )
- {
- $this->bolink( );
// call constructor of derived class
- $this->public_functions += array( // extend
public_functions
- 'getEntry' => True,
- 'showLinks' => True
- );
- }
-
- /*!
- @function getEntry
- @syntax getEntry( $name )
- @author ralfbecker
- @abstract HTML UI to query user for one side of a link: an
entry of a supported app
- @param $name base-name of the input-fields
- @result html: table-row(s) with 4 cols
- */
- function getEntry($name,$app='',$id=0)
- {
- $value = get_var($name,array('POST'));
- if (!is_array($value))
- {
- $value = array();
- }
- if ($this->debug)
- {
- echo "<p>uilink.getEntry('$name','$app',$id):
$name = "; _debug_array($value);
- }
- if ($value['create'] && $value['app'] && $value['id']
&& $app)
- {
-
$this->link($app,&$id,$value['app'],$value['id'],$value['remark']);
- }
- if ($value['search'] && count($ids =
$this->query($value['app'],$value['query'])))
- {
- $value = array(
- 'app' => $value['app'],
- 'options-id' => $ids,
- 'remark' => ''
- );
- $etemplate =
CreateObject('etemplate.etemplate','infolog.linkto_widget.create');
- $html = CreateObject('etemplate.html');
- $out =
$etemplate->show($value,'','',$name)."\n".$html->input_hidden($name.'[app]',$value['app']);
- }
- else
- {
- $value = array(
- 'app' => $value['app'],
- 'options-app' => $this->app_list(),
- 'query' => '',
- 'msg' => $value['search'] ? 'Nothing
found - try again!!!' : ''
- );
- $etemplate =
CreateObject('etemplate.etemplate','infolog.linkto_widget.search');
- $out = $etemplate->show($value,'','',$name);
- }
- $out = str_replace('[]','',$out);
- return eregi_replace('[</]*table[^>]*>','',$out);
- }
-
- /*!
- @function showLinks
- @syntax showLinks(
$name,$app,$id,$only_app='',$show_unlink=True )
- @author ralfbecker
- @abstract HTML UI to show & delete existing links to $app,$id
- @param $name base-name of the input-fields
- @param $only_app if set return only links from $only_app (eg.
only addressbook-entries) or NOT from if $only_app[0]=='!'
- @param $show_unlink boolean show unlink button for each link
(default true)
- @result html: table-row(s) with 4 cols
- */
- function
showLinks($name,$app,$id,$only_app='',$show_unlink=True)
- {
- $value = get_var($name,array('POST'));
- if (!is_array($value))
- {
- $value = array();
- }
- list($unlink) = @each($value['unlink']);
- if ($this->debug)
- {
- echo "<p>uilink.showLinks: app='$app',id='$id',
unlink=$unlink, $name = "; _debug_array($value);
- }
- if ($unlink)
- {
- $this->unlink($unlink,$app,$id);
- //echo "<p>$unlink unlinked</p>\n";
- }
- $etemplate =
CreateObject('etemplate.etemplate','infolog.linklist_widget');
- $links = $this->get_links($app,$id,$only_app);
- $value = array();
- for($row=$etemplate->rows-1; list(,$link) =
each($links); ++$row)
- {
- $value[$row] = $link;
- $value[$row]['title'] =
$this->title($link['app'],$link['id']);
- }
- $value['app'] = $app;
- $value['id'] = $id;
- $value['title'] = $this->title($app,$id);
-
- $out = $etemplate->show($value,'','',$name);
-
- $out = str_replace('[]','',$out);
- return eregi_replace('[</]*table[^>]*>','',$out);
- }
-
- /*!
- @function viewLink
- @syntax viewLink( $app,$id,$content='' )
- @author ralfbecker
- @abstract link to view entry $id of $app
- @param $content if set result will be like "<a
href=[link]>$content</a>"
- @result link to view $id in $app or False if no link for $app
registered or $id==''
- */
- function viewLink($app,$id,$html='')
- {
- $view = $this->view($app,$id);
- if (!count($view))
- {
- return False;
- }
- $html = CreateObject('etemplate.html');
- return $content == '' ? $html->link('/index.php',$view)
: $html->a_href($content,'/index.php',$view);
- }
-
- /*!
- @function linkBox
- @syntax linkBox( $app,$id,$only_app='',$show_unlink=True )
- @author ralfbecker
- @abstract HTML UI to show, delete & add links to $app,$id
- @param $only_app if set return only links from $only_app (eg.
only addressbook-entries) or NOT from if $only_app[0]=='!'
- @param $show_unlink boolean show unlink button for each link
(default true)
- @result html: table-row(s) with 4 cols
- */
- function linkBox($app,$id,$only_app='',$show_unlink=True)
- {
-
- }
- }
-
-
-
-
+<?php
+ /**********************************************************************\
+ * phpGroupWare - InfoLog *
+ * http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/ *
+ * *
+ * Copyright 2002, 2003 Free Software Foundation, Inc. *
+ * *
+ * Originally Written by Ralf Becker - <address@hidden> *
+ * Based on ToDo Written by Joseph Engo <jengo at phpgroupware.org> *
+ * --------------------------------------------
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * at your option) any later version. *
+ \**********************************************************************/
+ /* $Id$ */
+
+ include_once(PHPGW_INCLUDE_ROOT . '/infolog/inc/class.bolink.inc.php');
+
+ /*!
+ @class uilink
+ @author ralfbecker
+ @abstract generalized linking between entries of phpGroupware apps -
HTML UI layer
+ @discussion This class is the UI to show/modify the links
+ @discussion Links have to ends each pointing to an entry, an entry is a
double:
+ @discussion app app-name or directory-name of an phpgw application,
eg. 'infolog'
+ @discussion id this is the id, eg. an integer or a tupple like
'0:INBOX:1234'
+ */
+ class uilink extends bolink
+ {
+ function uilink( )
+ {
+ $this->bolink( );
// call constructor of derived class
+ $this->public_functions += array( // extend
public_functions
+ 'getEntry' => True,
+ 'showLinks' => True
+ );
+ }
+
+ /*!
+ @function getEntry
+ @syntax getEntry( $name )
+ @author ralfbecker
+ @abstract HTML UI to query user for one side of a link: an
entry of a supported app
+ @param $name base-name of the input-fields
+ @result html: table-row(s) with 4 cols
+ */
+ function getEntry($name,$app='',$id=0)
+ {
+ $value = get_var($name,array('POST'));
+ if (!is_array($value))
+ {
+ $value = array();
+ }
+ if ($this->debug)
+ {
+ echo "<p>uilink.getEntry('$name','$app',$id):
$name = "; _debug_array($value);
+ }
+ if ($value['create'] && $value['app'] && $value['id']
&& $app)
+ {
+
$this->link($app,$id,$value['app'],$value['id'],$value['remark']);
+ }
+ if ($value['search'] && count($ids =
$this->query($value['app'],$value['query'])))
+ {
+ $value = array(
+ 'app' => $value['app'],
+ 'options-id' => $ids,
+ 'remark' => ''
+ );
+ $etemplate =
CreateObject('etemplate.etemplate','infolog.linkto_widget.create');
+ $html = CreateObject('etemplate.html');
+ $out =
$etemplate->show($value,'','',$name)."\n".$html->input_hidden($name.'[app]',$value['app']);
+ }
+ else
+ {
+ $value = array(
+ 'app' => $value['app'],
+ 'options-app' => $this->app_list(),
+ 'query' => '',
+ 'msg' => $value['search'] ? 'Nothing
found - try again!!!' : ''
+ );
+ $etemplate =
CreateObject('etemplate.etemplate','infolog.linkto_widget.search');
+ $out = $etemplate->show($value,'','',$name);
+ }
+ $out = str_replace('[]','',$out);
+ return eregi_replace('[</]*table[^>]*>','',$out);
+ }
+
+ /*!
+ @function showLinks
+ @syntax showLinks(
$name,$app,$id,$only_app='',$show_unlink=True )
+ @author ralfbecker
+ @abstract HTML UI to show & delete existing links to $app,$id
+ @param $name base-name of the input-fields
+ @param $only_app if set return only links from $only_app (eg.
only addressbook-entries) or NOT from if $only_app[0]=='!'
+ @param $show_unlink boolean show unlink button for each link
(default true)
+ @result html: table-row(s) with 4 cols
+ */
+ function
showLinks($name,$app,$id,$only_app='',$show_unlink=True)
+ {
+ $value = get_var($name,array('POST'));
+ if (!is_array($value))
+ {
+ $value = array();
+ }
+ list($unlink) = @each($value['unlink']);
+ if ($this->debug)
+ {
+ echo "<p>uilink.showLinks: app='$app',id='$id',
unlink=$unlink, $name = "; _debug_array($value);
+ }
+ if ($unlink)
+ {
+ $this->unlink($unlink,$app,$id);
+ //echo "<p>$unlink unlinked</p>\n";
+ }
+ $etemplate =
CreateObject('etemplate.etemplate','infolog.linklist_widget');
+ $links = $this->get_links($app,$id,$only_app);
+ $value = array();
+ for($row=$etemplate->rows-1; list(,$link) =
each($links); ++$row)
+ {
+ $value[$row] = $link;
+ $value[$row]['title'] =
$this->title($link['app'],$link['id']);
+ }
+ $value['app'] = $app;
+ $value['id'] = $id;
+ $value['title'] = $this->title($app,$id);
+
+ $out = $etemplate->show($value,'','',$name);
+
+ $out = str_replace('[]','',$out);
+ return eregi_replace('[</]*table[^>]*>','',$out);
+ }
+
+ /*!
+ @function viewLink
+ @syntax viewLink( $app,$id,$content='' )
+ @author ralfbecker
+ @abstract link to view entry $id of $app
+ @param $content if set result will be like "<a
href=[link]>$content</a>"
+ @result link to view $id in $app or False if no link for $app
registered or $id==''
+ */
+ function viewLink($app,$id,$html='')
+ {
+ $view = $this->view($app,$id);
+ if (!count($view))
+ {
+ return False;
+ }
+ $html = CreateObject('etemplate.html');
+ return $content == '' ? $html->link('/index.php',$view)
: $html->a_href($content,'/index.php',$view);
+ }
+
+ /*!
+ @function linkBox
+ @syntax linkBox( $app,$id,$only_app='',$show_unlink=True )
+ @author ralfbecker
+ @abstract HTML UI to show, delete & add links to $app,$id
+ @param $only_app if set return only links from $only_app (eg.
only addressbook-entries) or NOT from if $only_app[0]=='!'
+ @param $show_unlink boolean show unlink button for each link
(default true)
+ @result html: table-row(s) with 4 cols
+ */
+ function linkBox($app,$id,$only_app='',$show_unlink=True)
+ {
+
+ }
+ }
+
+
+
+
====================================================
Index: infolog/inc/class.uiinfolog.inc.php
diff -u infolog/inc/class.uiinfolog.inc.php:1.77
infolog/inc/class.uiinfolog.inc.php:1.78
--- infolog/inc/class.uiinfolog.inc.php:1.77 Fri Jan 7 01:37:22 2005
+++ infolog/inc/class.uiinfolog.inc.php Wed May 4 14:19:07 2005
@@ -273,7 +273,7 @@
$action_id = 0;
break;
}
- $values['main'][1] =
$this->get_info($action_id,&$readonlys['main']);
+ $values['main'][1] =
$this->get_info($action_id,$readonlys['main']);
break;
}
$readonlys['cancel'] = $action != 'sp';
@@ -310,7 +310,7 @@
return $referer ?
$this->tmpl->location($referer) : $this->index();
}
$readonlys = $values = array();
- $values['main'][1] =
$this->get_info($info_id,&$readonlys['main']);
+ $values['main'][1] =
$this->get_info($info_id,$readonlys['main']);
$this->tmpl->read('infolog.delete');
====================================================
Index: infolog/inc/class.soinfolog.inc.php
diff -u infolog/inc/class.soinfolog.inc.php:1.24
infolog/inc/class.soinfolog.inc.php:1.25
--- infolog/inc/class.soinfolog.inc.php:1.24 Fri Jan 7 01:37:22 2005
+++ infolog/inc/class.soinfolog.inc.php Wed May 4 14:19:07 2005
@@ -540,7 +540,7 @@
$this->db->limit_query($sql="SELECT DISTINCT
phpgw_infolog.* $query $ordermethod",$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
- $this->db2data(&$info);
+ $this->db2data($info);
$ids[$info['info_id']] = $info;
}
}
====================================================
Index: infolog/inc/class.boinfolog.inc.php
diff -u infolog/inc/class.boinfolog.inc.php:1.41
infolog/inc/class.boinfolog.inc.php:1.42
--- infolog/inc/class.boinfolog.inc.php:1.41 Fri Jan 7 02:49:38 2005
+++ infolog/inc/class.boinfolog.inc.php Wed May 4 14:19:07 2005
@@ -266,7 +266,7 @@
function link_query( $pattern )
{
$start = $total = 0;
- $ids =
$this->search('','','','',$pattern,'','','',&$start,&$total);
+ $ids =
$this->search('','','','',$pattern,'','','',$start,$total);
$content = array();
while (is_array($ids) && list( $id,$info ) = each( $ids
))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] infolog/inc class.uilink.inc.php, 1.8 class.uiinfolog.inc.php, 1.78 class.soinfolog.inc.php, 1.25 class.boinfolog.inc.php, 1.42,
powerstat <=