[basedb-cvs] basedb/include/web hyb_common.inc.php,1.10,1.11

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/include/web
In directory sc8-pr-cvs1:/tmp/cvs-serv1522/include/web

Modified Files:
	hyb_common.inc.php 
Log Message:
Updated image channel handling

Index: hyb_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/hyb_common.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hyb_common.inc.php	3 Feb 2003 08:51:13 -0000	1.10
--- hyb_common.inc.php	13 Feb 2003 11:36:52 -0000	1.11
***************
*** 153,156 ****
--- 153,157 ----
  	$l =& $lab[$acqid];
  
+ 	$ch = (int)$ch;
  	$clink = isset($chnames[$ch]) ? html($chnames[$ch]) : "unknown";
  	if(isset($l[$ch]))
***************
*** 161,165 ****
  // Image list for an imageacquisition. Makes its own table, wants to be
  // in a form called ff.
! function imageList(&$acq, &$user, $edit)
  {
  	global $tdbg;
--- 162,166 ----
  // Image list for an imageacquisition. Makes its own table, wants to be
  // in a form called ff.
! function imageList(&$acq, &$user, $edit, $titleextra = "")
  {
  	global $tdbg;
***************
*** 175,180 ****
  	$sortorder = array(1, 1, 1, -1, 1, 1, -1, 0);
  	$defsort = 0;
  	makeSearchHeader($search, $headerfields, $sortorder, $defsort,
! 		"", "document.ff.submit();", "Images ".webHelp(92, 1), 2);
  
  	if($acq->mayEdit($user))
--- 176,183 ----
  	$sortorder = array(1, 1, 1, -1, 1, 1, -1, 0);
  	$defsort = 0;
+ 	if($titleextra != "")
+ 		$titleextra .= " ";
  	makeSearchHeader($search, $headerfields, $sortorder, $defsort,
! 		"", "document.ff.submit();", "Images $titleextra".webHelp(92, 1), 2);
  
  	if($acq->mayEdit($user))