From c32633f81b3ee0c93ef16a484aa088173e255174 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 28 May 2006 05:58:47 +0000
Subject: [PATCH] r852: Removing the exclusionary filters for notificaions; too
 much of a headache to implement

---
 docs/template_changes.txt | 19 -------------------
 includes/permissions.php  |  4 ----
 templates/userctrl.tpl    | 18 ------------------
 3 files changed, 41 deletions(-)

diff --git a/docs/template_changes.txt b/docs/template_changes.txt
index c00a737..5523b5a 100644
--- a/docs/template_changes.txt
+++ b/docs/template_changes.txt
@@ -220,25 +220,6 @@ Index: templates/userctrl.tpl
 +                               <td><input type="checkbox" name="emailopts[16][1024]"{$checked[16][1024]} value="1" /></td>
 +                               <td>{@"Any other field changes"}</td>
 +                       </tr>
-+
-+                       <tr style="text-align: center; background-color: $stylevar[alt_colour]">
-+                               <td><input type="checkbox" name="emailopts[1][2048]"{$checked[1][2048]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[2][2048]"{$checked[2][2048]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[4][2048]"{$checked[4][2048]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[8][2048]"{$checked[8][2048]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[16][2048]"{$checked[16][2048]} value="1" /></td>
-+                               <td>{@"<em>NOT IF</em> an unconfirmed bug"}</td>
-+                       </tr>
-+
-+                       <tr style="text-align: center">
-+                               <td><input type="checkbox" name="emailopts[1][4096]"{$checked[1][4096]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[2][4096]"{$checked[2][4096]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[4][4096]"{$checked[4][4096]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[8][4096]"{$checked[8][4096]} value="1" /></td>
-+                               <td><input type="checkbox" name="emailopts[16][4096]"{$checked[16][4096]} value="1" /></td>
-+                               <td>{@"<em>NOT IF</em> change was by me"}</td>
-+                       </tr>
-+                       </table>
 +               </div>
 +       </div>
 +
diff --git a/includes/permissions.php b/includes/permissions.php
index 0e56279..620f84e 100644
--- a/includes/permissions.php
+++ b/includes/permissions.php
@@ -69,10 +69,6 @@ $bugsys->emailoptions = array(
 		'newcomment'		=> 256, // new comment
 		'newattachment'		=> 512, // new attachment
 		'otherfield'		=> 1024, // any other field changes
-
-		// exclusionary
-		'notunconfirmed'	=> 2048, // not for unconfirmed bugs
-		'notbyme'			=> 4096 // not for changes by me
 	)
 );
 
diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index 4f8ca57..cc95fdd 100644
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -168,24 +168,6 @@ $header
 				<td><input type="checkbox" name="emailopts[16][1024]"{$checked[16][1024]} value="1" /></td>
 				<td>{@"Any other field changes"}</td>
 			</tr>
-			
-			<tr style="text-align: center; background-color: $stylevar[alt_colour]">
-				<td><input type="checkbox" name="emailopts[1][2048]"{$checked[1][2048]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[2][2048]"{$checked[2][2048]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[4][2048]"{$checked[4][2048]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[8][2048]"{$checked[8][2048]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[16][2048]"{$checked[16][2048]} value="1" /></td>
-				<td>{@"<em>NOT IF</em> an unconfirmed bug"}</td>
-			</tr>
-			
-			<tr style="text-align: center">
-				<td><input type="checkbox" name="emailopts[1][4096]"{$checked[1][4096]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[2][4096]"{$checked[2][4096]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[4][4096]"{$checked[4][4096]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[8][4096]"{$checked[8][4096]} value="1" /></td>
-				<td><input type="checkbox" name="emailopts[16][4096]"{$checked[16][4096]} value="1" /></td>
-				<td>{@"<em>NOT IF</em> change was by me"}</td>
-			</tr>
 			</table>
 		</div>
 	</div>
-- 
2.22.5