[eGroupWare-cvs] sitemgr/inc class.Common_BO.inc.php,1.5,1.6 class.Modules_SO.inc.php,1.3,1.4 class.module.inc.php,1.13,1.14

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

Update of /cvsroot/egroupware/sitemgr/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv13219/inc

Modified Files:
	class.Common_BO.inc.php class.Modules_SO.inc.php 
	class.module.inc.php 
Log Message:
lots of fixes and reworked the default_records to install a complete demo-site without any user interaction. Anyone not used sitemgr before, should re-install it to get the benefits

Index: class.Common_BO.inc.php
===================================================================
RCS file: /cvsroot/egroupware/sitemgr/inc/class.Common_BO.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.Common_BO.inc.php	6 Jun 2003 02:14:55 -0000	1.5
--- class.Common_BO.inc.php	29 Dec 2003 21:18:00 -0000	1.6
***************
*** 103,108 ****
  			$file['Commit Changes'] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.commit');
  			$file['Manage archived content'] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.archive');
! 			$file['_NewLine_'] ='';
! 			$file['View Generated Site'] = $GLOBALS['phpgw']->link('/sitemgr-link/');
  			return $file;
  		}
--- 103,112 ----
  			$file['Commit Changes'] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.commit');
  			$file['Manage archived content'] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.archive');
! 
! 			if ($GLOBALS['phpgw_info']['user']['apps']['sitemgr-link'])	// show it only if user has rights to it
! 			{
! 				$file[] = '_NewLine_';
! 				$file['View Generated Site'] = $GLOBALS['phpgw']->link('/sitemgr-link/');
! 			}
  			return $file;
  		}

Index: class.Modules_SO.inc.php
===================================================================
RCS file: /cvsroot/egroupware/sitemgr/inc/class.Modules_SO.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.Modules_SO.inc.php	4 Mar 2003 17:26:43 -0000	1.3
--- class.Modules_SO.inc.php	29 Dec 2003 21:18:00 -0000	1.4
***************
*** 32,36 ****
  			else
  			{
! 				"SELECT properties FROM phpgw_sitemgr_properties AS t1 LEFT JOIN phpgw_sitemgr_modules AS t2 ON t1.module_id=t2.module_id WHERE area='$contentarea' AND cat_id = $cat_id AND module_name = '$modulename'";
  			}
  			$this->db->query($sql,__LINE__,__FILE__);
--- 32,36 ----
  			else
  			{
! 				$sql = "SELECT properties FROM phpgw_sitemgr_properties AS t1 LEFT JOIN phpgw_sitemgr_modules AS t2 ON t1.module_id=t2.module_id WHERE area='$contentarea' AND cat_id = $cat_id AND module_name = '$modulename'";
  			}
  			$this->db->query($sql,__LINE__,__FILE__);
***************
*** 132,134 ****
  			return $this->constructmodulearray($sql);
  		}
! 	}
\ No newline at end of file
--- 132,134 ----
  			return $this->constructmodulearray($sql);
  		}
! 	}

Index: class.module.inc.php
===================================================================
RCS file: /cvsroot/egroupware/sitemgr/inc/class.module.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.module.inc.php	28 Aug 2003 14:30:37 -0000	1.13
--- class.module.inc.php	29 Dec 2003 21:18:00 -0000	1.14
***************
*** 1,3 ****
! <?php 
  
  class Transformer
--- 1,3 ----
! <?php
  
  class Transformer
***************
*** 42,46 ****
  
  	//before calling the functions get_user_interface, get_output,
! 	//the function set_block is used, so that we know in what scope we are, know the arguments, 
  	//and can retrieve the properties
  	//this function can be overriden (but do not forget to call parent::set_block) in order to do some configuration
--- 42,46 ----
  
  	//before calling the functions get_user_interface, get_output,
! 	//the function set_block is used, so that we know in what scope we are, know the arguments,
  	//and can retrieve the properties
  	//this function can be overriden (but do not forget to call parent::set_block) in order to do some configuration
***************
*** 90,94 ****
  	}
  
! 	function link($modulevars=array())
  	{
  		while (list($key,$value) = @each($modulevars))
--- 90,94 ----
  	}
  
! 	function link($modulevars=array(),$extravars=array())
  	{
  		while (list($key,$value) = @each($modulevars))
***************
*** 295,301 ****
  				{
  					$selected='';
! 					if 
  					(
! 						($input['multiple'] && is_array($default) && in_array($value,$default)) || 
  						(!$input['multiple'] && ($default == $value))
  					)
--- 295,301 ----
  				{
  					$selected='';
! 					if
  					(
! 						($input['multiple'] && is_array($default) && in_array($value,$default)) ||
  						(!$input['multiple'] && ($default == $value))
  					)