[basedb-cvs] basedb/include/web experiment_common.inc.php,1.25,1.26 item_common.inc.php,1.17,1.18 links_common.inc.php,1.14,1.15

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

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

Modified Files:
	experiment_common.inc.php item_common.inc.php 
	links_common.inc.php 
Log Message:
Fixed problems that were found while running as non-superuser

Index: experiment_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/experiment_common.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** experiment_common.inc.php	11 Feb 2003 14:43:12 -0000	1.25
--- experiment_common.inc.php	15 Feb 2003 11:29:07 -0000	1.26
***************
*** 573,577 ****
  		unset($s);
  
! 		if($ass)
  		{
  ?>
--- 573,577 ----
  		unset($s);
  
! 		if($ass && $exp->mayEdit($user))
  		{
  ?>

Index: item_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/item_common.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** item_common.inc.php	28 Jan 2003 17:22:55 -0000	1.17
--- item_common.inc.php	15 Feb 2003 11:29:07 -0000	1.18
***************
*** 192,196 ****
  		else
  		{
! 			if($user->getId() == $item->getOwner)
  				$un = html($user->getName());
  			else
--- 192,196 ----
  		else
  		{
! 			if($user->getId() == $item->getOwner())
  				$un = html($user->getName());
  			else

Index: links_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/links_common.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** links_common.inc.php	13 Feb 2003 08:47:47 -0000	1.14
--- links_common.inc.php	15 Feb 2003 11:29:07 -0000	1.15
***************
*** 51,55 ****
  	if(!isset($arr["sample"]))
  		return html("");
! 	if(!$arr["sampleRead"])
  		return html($arr["sampleName"]).remMark($arr["sampleRemoved"]);
  	return "<a ".href("sample_edit.phtml?i_samp=".
--- 51,55 ----
  	if(!isset($arr["sample"]))
  		return html("");
! 	if(!acc(Sample::globalRead()) || !$arr["sampleRead"])
  		return html($arr["sampleName"]).remMark($arr["sampleRemoved"]);
[...187 lines suppressed...]
+ 	{
+ 		return html($arr["name"]).remMark($arr["removed"]).
+ 			(isset($arr["isReviewer"]) && $arr["isReviewer"] ?
+ 			" (reviewer)" : "");
+ 	}
  	return "<a ".href("usergroup_edit.phtml?i_ug=".
  		(int)$arr["id"], 2).">".
***************
*** 349,353 ****
  function plateTypeArrLink(&$arr)
  {
! 	if(!$arr["typeRead"])
  		return html($arr["typeName"]).remMark($arr["typeRemoved"]);
  	return "<a ".href("platetype_edit.phtml?i_pt=".
--- 362,366 ----
  function plateTypeArrLink(&$arr)
  {
! 	if(!acc(PlateType::globalRead()) || !$arr["typeRead"])
  		return html($arr["typeName"]).remMark($arr["typeRemoved"]);
  	return "<a ".href("platetype_edit.phtml?i_pt=".