[eGroupWare-cvs] infolog/inc class.uiinfolog.inc.php,1.81,1.82

[<ral...@us...>]

Update of /cvsroot/egroupware/infolog/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21298

Modified Files:
	class.uiinfolog.inc.php 
Log Message:
1) fixed bug #905779: main links title in contact field (blur text) got lost on changeing info-type
2) implemented separate sessions for infolog called via a hook and normal call, feature-request #903578


Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/egroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** class.uiinfolog.inc.php	5 Feb 2004 13:37:28 -0000	1.81
--- class.uiinfolog.inc.php	28 Feb 2004 14:58:44 -0000	1.82
***************
*** 129,133 ****
  		function save_sessiondata($values)
  		{
! 			$GLOBALS['phpgw']->session->appsession('session_data','infolog',array(
  				'search' => $values['search'],
  				'start'  => $values['start'],
--- 129,135 ----
  		function save_sessiondata($values)
  		{
! 			$for = @$values['session_for'] ? $values['session_for'] : @$this->called_by;
! 			//echo "<p>$for: uiinfolog::save_sessiondata(".print_r($values,True).") called_by='$this->called_by'</p>\n";
! 			$GLOBALS['phpgw']->session->appsession($for.'session_data','infolog',array(
  				'search' => $values['search'],
  				'start'  => $values['start'],
***************
*** 136,143 ****
  				'order'  => $values['order'],
  				'sort'   => $values['sort'],
! 				'col_filter' => $values['col_filter']
  			));
  		}
  
  		function get_rows($query,&$rows,&$readonlys)
  		{
--- 138,158 ----
  				'order'  => $values['order'],
  				'sort'   => $values['sort'],
! 				'col_filter' => $values['col_filter'],
! 				'session_for' => $for
  			));
  		}
  
+ 		function read_sessiondata()
+ 		{
+ 			$values = $GLOBALS['phpgw']->session->appsession(@$this->called_by.'session_data','infolog');
+ 			if (!@$values['session_for'] && $this->called_by)
+ 			{
+ 				$values['session_for'] = $this->called_by;
+ 				$this->save_sessiondata($values);
+ 			}
+ 			//echo "<p>$this->called_by: uiinfolog::read_sessiondata() = ".print_r($values,True)."</p>\n";
+ 			return $values;
+ 		}
+ 
  		function get_rows($query,&$rows,&$readonlys)
  		{
***************
*** 171,175 ****
  			if (!is_array($values))
  			{
! 				$values = array('nm' => $GLOBALS['phpgw']->session->appsession('session_data','infolog'));
  				if (isset($_GET['filter']))
  				{
--- 186,190 ----
  			if (!is_array($values))
  			{
! 				$values = array('nm' => $this->read_sessiondata());
  				if (isset($_GET['filter']))
  				{
***************
*** 182,189 ****
  				}
  			}
- 			else
- 			{
- 				$this->save_sessiondata($values['nm']);
- 			}
  			if ($action == '')
  			{
--- 197,200 ----
***************
*** 230,233 ****
--- 241,248 ----
  				}
  			}
+ 			else
+ 			{
+ 				$this->save_sessiondata($values['nm']);
+ 			}
  			switch ($action)
  			{
***************
*** 474,478 ****
  					default:	// to allow other apps to participate
  						$content['info_link_id'] = $this->link->link('infolog',$content['link_to']['to_id'],$action,$action_id);
! 						$content['blur_title']   = $this->link->title($action,$action_id);
  
  					case '':
--- 489,493 ----
  					default:	// to allow other apps to participate
  						$content['info_link_id'] = $this->link->link('infolog',$content['link_to']['to_id'],$action,$action_id);
! //						$content['blur_title']   = $this->link->title($action,$action_id);
  
  					case '':
***************
*** 496,499 ****
--- 511,518 ----
  				}
  			}
+ 			if ($action && $action != 'new' && $action != 'sp')
+ 			{
+ 				$content['blur_title']   = $this->link->title($action,$action_id);
+ 			}
  			$readonlys['delete'] = !$info_id || !$this->bo->check_access($info_id,PHPGW_ACL_DELETE);
  
***************
*** 699,704 ****
  				return False;
  			}
! 			$save_app = $GLOBALS['phpgw_info']['flags']['currentapp']; 
! 			$GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog'; 
  
  			$GLOBALS['phpgw']->translation->add_app('infolog');
--- 718,725 ----
  				return False;
  			}
! 			$this->called_by = $app;	// for read/save_sessiondata, to have different sessions for the hooks
! 
! 			$save_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
! 			$GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';
  
  			$GLOBALS['phpgw']->translation->add_app('infolog');