[phpBT-dev] CVS: phpbt/templates/default bugdisplay.html,1.50,1.51 bugform.html,1.12,1.13 wrap.html,1.32,1.33

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29692/phpbt/templates/default

Modified Files:
	bugdisplay.html bugform.html wrap.html 
Log Message:
Various permission related fixes.


Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- bugdisplay.html	22 Aug 2005 20:30:56 -0000	1.50
+++ bugdisplay.html	27 Aug 2005 13:14:28 -0000	1.51
@@ -128,7 +128,7 @@
 		<td><select name="resolution_id" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('resolution', $resolution_id) ?></select></td>
 	</tr><tr>
 		<td><?php echo translate("Assigned to"); ?>:</td>
-		<?php if (isset($perm) && $perm->have_perm('EditAssignment')) { ?>
+		<?php if (isset($perm) && ($perm->have_perm('EditAssignment') or $perm->have_perm_proj($project_id))) { ?>
 		<td><select name="assigned_to" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('owner', $assigned_to) ?></select></td>
 		<?php } else { ?>
 		<td>
@@ -210,7 +210,7 @@
 					<td align="center"><?php echo $attachments[$i]['mime_type']; ?></td>
 					<td align="center"><?php echo date(DATE_FORMAT, $attachments[$i]['created_date']); ?></td>
 					<td align="center"><a href='attachment.php?attachid=<?php echo $attachments[$i]['attachment_id']; ?>'>View</a>
-					<?php if (isset($perm) and $perm->have_perm('Administrator')) { ?>
+					<?php if (isset($perm) and $perm->have_perm_proj($project_id)) { ?>
 						| <a href='attachment.php?del=<?php echo $attachments[$i]['attachment_id']; ?>' onClick="return confirm('<?php echo translate("Are you sure you want to delete this attachment?"); ?>');"><?php echo translate("Delete"); ?></a>
 					<?php } ?>
 					</td>

Index: bugform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugform.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bugform.html	20 Jul 2005 18:01:33 -0000	1.12
+++ bugform.html	27 Aug 2005 13:14:28 -0000	1.13
@@ -10,6 +10,8 @@
 	if (!isset($database))    $database = '';
 	if (!isset($site))        $site = '';
 	if (!isset($os))          $os = '';
+
+	$reporter = $reporter ? $reporter : $u
 ?>
 		<form action="bug.php" method="post" enctype="multipart/form-data">
 			<table border="0">
@@ -33,9 +35,15 @@
 						<?php echo translate("Reporter"); ?>:
 					</td>
 					<td>
+					<?php if (isset($perm) and $perm->have_perm_proj($project)) { ?>
 						<select name="reporter">
 							<?php build_select('reporter', $reporter) ?>
 						</select>
+					<?php 	}
+						else {
+							echo lookup('reporter', $reporter);
+						} ?>
+						<input type="hidden" name="reporter" value="<?php echo $reporter ?>">
 					</td>
 				</tr>
 				<tr>

Index: wrap.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/wrap.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wrap.html	22 Aug 2005 20:30:56 -0000	1.32
+++ wrap.html	27 Aug 2005 13:14:28 -0000	1.33
@@ -26,7 +26,7 @@
 		<li><a href="report.php"><?php echo translate("View Reports"); ?></a></li>
 		<?php if (!NEW_ACCOUNTS_DISABLED && empty($_SESSION['uid'])) { ?><li><a href="newaccount.php"><?php echo translate("Create a New Account"); ?></a></li><?php } ?>
 		<li><a href="docs/html/userguide.html"><?php echo translate("Read Documentation"); ?></a></li>
-		<?php if (isset($perm) && $perm->have_perm('Administrator')) { ?><li><a href="admin/project.php"><?php echo translate("Administration Tools"); ?></a></li><?php } ?>
+		<?php if (isset($perm) && $perm->have_perm_proj()) { ?><li><a href="admin/project.php"><?php echo translate("Administration Tools"); ?></a></li><?php } ?>
 	</ul>
 </div>