$datepart = "and bugs_activity.bug_when >= $starttime";
}
my $query = "
- select bugs_activity.field, bugs_activity.bug_when,
+ SELECT fielddefs.name, bugs_activity.bug_when,
bugs_activity.oldvalue, bugs_activity.newvalue,
profiles.login_name
- from bugs_activity,profiles
- where bugs_activity.bug_id = $id $datepart
- and profiles.userid = bugs_activity.who
- order by bugs_activity.bug_when";
+ FROM bugs_activity,profiles,fielddefs
+ WHERE bugs_activity.bug_id = $id $datepart
+ AND fielddefs.fieldid = bugs_activity.fieldid
+ AND profiles.userid = bugs_activity.who
+ ORDER BY bugs_activity.bug_when";
SendSQL($query);
my @list;
foreach my $f (@$ref) {
- push(@list, "\nbugs_activity.field = " . SqlQuote($f));
+ push(@list, "\nbugs_activity.fieldid = " . GetFieldID($f));
}
$query .= "and bugs_activity.bug_id = bugs.bug_id and (" .
join(' or ', @list) . ") ";
$qacontactpart = ", the current QA Contact";
}
my $loginname = SqlQuote($::COOKIE{'Bugzilla_login'});
- SendSQL("select emailnotification,realname from profiles where login_name = " .
+ SendSQL("select emailnotification,realname,newemailtech from profiles where login_name = " .
$loginname);
- my ($emailnotification, $realname) = (FetchSQLData());
+ my ($emailnotification, $realname, $newemailtech) = (FetchSQLData());
$realname = value_quote($realname);
print qq{
<form method=post>
</SELECT>
</td>
</tr>
+";
+ if (Param("newemailtech")) {
+ my $checkedpart = $newemailtech ? "CHECKED" : "";
+ print qq{
+<tr><td colspan=2><hr></td></tr>
+<tr><td align=right><font color="red">New!</font> Bugzilla has a new email
+notification scheme. It is <b>experimental and bleeding edge</b> and will
+hopefully evolve into a brave new happy world where all the spam and ugliness
+of the old notifications will go away. If you wish to sign up for this (and
+risk any bugs), check here.</td>
+<td><input type="checkbox" name="newemailtech" $checkedpart>New email tech</td>
+</tr>
+};
+ }
+ print "
</table>
<hr>
<input type=submit value=Submit>
}
-SendSQL("update profiles set emailnotification='$::FORM{'emailnotification'}' where login_name = " .
- SqlQuote($::COOKIE{'Bugzilla_login'}));
+SendSQL("UPDATE profiles " .
+ "SET emailnotification='$::FORM{'emailnotification'}', " .
+ " newemailtech = '$::FORM{'newemailtech'}' " .
+ "WHERE login_name = " . SqlQuote($::COOKIE{'Bugzilla_login'}));
my $newrealname = $::FORM{'realname'};
'bug_id mediumint not null,
who mediumint not null,
bug_when datetime not null,
- field varchar(64) not null,
+ fieldid mediumint not null,
oldvalue tinytext,
newvalue tinytext,
index (bug_id),
index (bug_when),
- index (field)';
+ index (fieldid)';
$table{attachments} =
keywords mediumtext not null, ' # Note: keywords field is only a cache;
# the real data comes from the keywords table.
. '
+ lastdiffed datetime not null,
index (assigned_to),
index (creation_ts),
groupset bigint not null,
emailnotification enum("ExcludeSelfChanges", "CConly", "All") not null default "ExcludeSelfChanges",
disabledtext mediumtext not null,
+ newemailtech tinyint not null,
index(login_name)';
+# This isn't quite cooked yet...
+#
+# $table{diffprefs} =
+# 'userid mediumint not null,
+# fieldid mediumint not null,
+# mailhead tinyint not null,
+# maildiffs tinyint not null,
+#
+# index(userid)';
+
+$table{fielddefs} =
+ 'fieldid mediumint not null auto_increment primary key,
+ name varchar(64) not null,
+ description mediumtext not null,
+ mailhead tinyint not null default 0,
+ sortkey smallint not null,
+
+ unique(name),
+ index(sortkey)';
+
$table{versions} =
'value tinytext,
program varchar(64)';
+###########################################################################
+# Populate the list of fields.
+###########################################################################
+
+my $headernum = 1;
+
+sub AddFDef ($$$) {
+ my ($name, $description, $mailhead) = (@_);
+
+ $name = $dbh->quote($name);
+ $description = $dbh->quote($description);
+
+ $dbh->do("REPLACE INTO fielddefs " .
+ "(name, description, mailhead, sortkey) VALUES " .
+ "($name, $description, $mailhead, $headernum)");
+ $headernum++;
+}
+
+
+AddFDef("bug_id", "Bug \#", 1);
+AddFDef("short_desc", "Summary", 1);
+AddFDef("product", "Product", 1);
+AddFDef("version", "Version", 1);
+AddFDef("rep_platform", "Platform", 1);
+AddFDef("op_sys", "OS/Version", 1);
+AddFDef("bug_status", "Status", 1);
+AddFDef("resolution", "Resolution", 1);
+AddFDef("bug_severity", "Severity", 1);
+AddFDef("priority", "Priority", 1);
+AddFDef("component", "Component", 1);
+AddFDef("assigned_to", "AssignedTo", 1);
+AddFDef("reporter", "ReportedBy", 1);
+AddFDef("qa_contact", "QAContact", 0);
+AddFDef("cc", "CC", 0);
+AddFDef("dependson", "BugsThisDependsOn", 0);
+AddFDef("blocked", "OtherBugsDependingOnThis", 0);
+AddFDef("target_milestone", "Target Milestone", 0);
+
+
+
+
###########################################################################
# Detect changed local settings
###########################################################################
}
+# 2000-01-18 Added a new table fielddefs that records information about the
+# different fields we keep an activity log on. The bugs_activity table
+# now has a pointer into that table instead of recording the name directly.
+
+if (GetFieldDef('bugs_activity', 'field')) {
+ AddField('bugs_activity', 'fieldid',
+ 'mediumint not null, ADD INDEX (fieldid)');
+ print "Populating new fieldid field ...\n";
+
+ $dbh->do("LOCK TABLES bugs_activity WRITE, fielddefs WRITE");
+
+ my $sth = $dbh->prepare('SELECT DISTINCT field FROM bugs_activity');
+ $sth->execute();
+ my %ids;
+ while (my ($f) = ($sth->fetchrow_array())) {
+ my $q = $dbh->quote($f);
+ my $s2 =
+ $dbh->prepare("SELECT fieldid FROM fielddefs WHERE name = $q");
+ $s2->execute();
+ my ($id) = ($s2->fetchrow_array());
+ if (!$id) {
+ $dbh->do("INSERT INTO fielddefs (name, description) VALUES " .
+ "($q, $q)");
+ $s2 = $dbh->prepare("SELECT LAST_INSERT_ID()");
+ $s2->execute();
+ ($id) = ($s2->fetchrow_array());
+ }
+ $dbh->do("UPDATE bugs_activity SET fieldid = $id WHERE field = $q");
+ }
+ $dbh->do("UNLOCK TABLES");
+
+ DropField('bugs_activity', 'field');
+}
+
+
+# 2000-01-18 New email-notification scheme uses a new field in the bug to
+# record when email notifications were last sent about this bug. Also,
+# added a user pref whether a user wants to use the brand new experimental
+# stuff.
+
+if (!GetFieldDef('bugs', 'lastdiffed')) {
+ AddField('bugs', 'lastdiffed', 'datetime not null');
+ $dbh->do('UPDATE bugs SET lastdiffed = delta_ts, delta_ts = delta_ts');
+}
+
+AddField('profiles', 'newemailtech', 'tinyint not null')
+
+
+
+
#
# If you had to change the --TABLE-- definition in any way, then add your
# differential change code *** A B O V E *** this comment.
%diffs%");
+DefParam("newemailtech",
+q{There is now experimental code in Bugzilla to do the email diffs in a
+new and exciting way. But this stuff is not very cooked yet. So, right
+now, to use it, the maintainer has to turn on this checkbox, and each user
+has to then turn on the "New email tech" preference.},
+ "b",
+ 0);
+
DefParam("whinedays",
SendSQL("UPDATE bugs SET delta_ts = now() WHERE bug_id = $bugid");
}
+sub GetFieldID {
+ my ($f) = (@_);
+ SendSQL("SELECT fieldid FROM fielddefs WHERE name = " . SqlQuote($f));
+ my $fieldid = FetchOneColumn();
+ if (!$fieldid) {
+ my $q = SqlQuote($f);
+ SendSQL("REPLACE INTO fielddefs (name, description) VALUES ($q, $q)");
+ SendSQL("SELECT LAST_INSERT_ID()");
+ $fieldid = FetchOneColumn();
+ }
+ return $fieldid;
+}
+
+
+
+
sub lsearch {
my ($list,$item) = (@_);
my $count = 0;
my $cols = LearnAboutColumns("bugs");
@::log_columns = @{$cols->{"-list-"}};
- foreach my $i ("bug_id", "creation_ts", "delta_ts", "long_desc") {
+ foreach my $i ("bug_id", "creation_ts", "delta_ts", "lastdiffed") {
my $w = lsearch(\@::log_columns, $i);
if ($w >= 0) {
splice(@::log_columns, $w, 1);
}
sub GetLongDescription {
- my ($id) = (@_);
+ my ($id, $start, $end) = (@_);
my $result = "";
- SendSQL("SELECT profiles.login_name, longdescs.bug_when, " .
- " longdescs.thetext " .
- "FROM longdescs, profiles " .
- "WHERE profiles.userid = longdescs.who " .
- " AND longdescs.bug_id = $id " .
- "ORDER BY longdescs.bug_when");
my $count = 0;
+ my ($query) = ("SELECT profiles.login_name, longdescs.bug_when, " .
+ " longdescs.thetext " .
+ "FROM longdescs, profiles " .
+ "WHERE profiles.userid = longdescs.who " .
+ " AND longdescs.bug_id = $id ");
+
+ if ($start && $start =~ /[1-9]/) {
+ # If the start is all zeros, then don't do this (because we want to
+ # not emit a leading "Addition Comments" line in that case.)
+ $query .= "AND longdescs.bug_when > '$start'";
+ $count = 1;
+ }
+ if ($end) {
+ $query .= "AND longdescs.bug_when <= '$end'";
+ }
+
+ $query .= "ORDER BY longdescs.bug_when";
+ SendSQL($query);
while (MoreSQLData()) {
my ($who, $when, $text) = (FetchSQLData());
if ($count) {
my ($i, $oldstr, $target, $me) = (@_);
my $newstr = SnapShotDeps($i, $target, $me);
if ($oldstr ne $newstr) {
- SendSQL("insert into bugs_activity (bug_id,who,bug_when,field,oldvalue,newvalue) values ($i,$whoid,$timestamp,'$target','$oldstr','$newstr')");
+ my $fieldid = GetFieldID($target);
+ SendSQL("INSERT INTO bugs_activity " .
+ "(bug_id,who,bug_when,fieldid,oldvalue,newvalue) VALUES " .
+ "($i,$whoid,$timestamp,$fieldid,'$oldstr','$newstr')");
return 1;
}
return 0;
#
foreach my $id (@idlist) {
my %dependencychanged;
- SendSQL("lock tables bugs write, bugs_activity write, cc write, profiles write, dependencies write, votes write, keywords write, longdescs write, keyworddefs read");
+ SendSQL("lock tables bugs write, bugs_activity write, cc write, profiles write, dependencies write, votes write, keywords write, longdescs write, fielddefs write, keyworddefs read");
my @oldvalues = SnapShotBug($id);
if (defined $::FORM{'delta_ts'} && $::FORM{'delta_ts'} ne $delta_ts) {
foreach my $ccid (keys %ccids) {
SendSQL("insert into cc (bug_id, who) values ($id, $ccid)");
}
+ my $newcclist = ShowCcList($id);
+ if ($newcclist ne $origcclist) {
+ my $col = GetFieldID('cc');
+ my $origq = SqlQuote($origcclist);
+ my $newq = SqlQuote($newcclist);
+ SendSQL("INSERT INTO bugs_activity " .
+ "(bug_id,who,bug_when,fieldid,oldvalue,newvalue) VALUES " .
+ "($id,$whoid,'$timestamp',$col,$origq,$newq)");
+ }
}
RemoveVotes($id,
"This bug has been moved to a different product");
}
- $col = SqlQuote($col);
+ $col = GetFieldID($col);
$old = SqlQuote($old);
$new = SqlQuote($new);
- my $q = "insert into bugs_activity (bug_id,who,bug_when,field,oldvalue,newvalue) values ($id,$whoid,'$timestamp',$col,$old,$new)";
+ my $q = "insert into bugs_activity (bug_id,who,bug_when,fieldid,oldvalue,newvalue) values ($id,$whoid,'$timestamp',$col,$old,$new)";
# puts "<pre>$q</pre>"
SendSQL($q);
}
my $didexclude = 0;
my %seen;
+my @sentlist;
sub fixaddresses {
my ($field, $list) = (@_);
my @result;
Unlock();
}
+
+sub FormatTriple {
+ my ($a, $b, $c) = (@_);
+ $^A = "";
+ my $temp = formline << 'END', $a, $b, $c;
+^>>>>>>>>>>>>>>>>>>|^<<<<<<<<<<<<<<<<<<<<<<<<<<<|^<<<<<<<<<<<<<<<<<<<<<<<<<<~~
+END
+ ; # This semicolon appeases my emacs editor macros. :-)
+ return $^A;
+}
+
+sub FormatDouble {
+ my ($a, $b) = (@_);
+ $a .= ":";
+ $^A = "";
+ my $temp = formline << 'END', $a, $b;
+^>>>>>>>>>>>>>>>>>> ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~~
+END
+ ; # This semicolon appeases my emacs editor macros. :-)
+ return $^A;
+}
+
+
+sub NewProcessOneBug {
+ my ($id) = (@_);
+
+ my @headerlist;
+ my %values;
+ my %defmailhead;
+ my %fielddescription;
+
+ my $msg = "";
+
+ SendSQL("SELECT name, description, mailhead FROM fielddefs " .
+ "ORDER BY sortkey");
+ while (MoreSQLData()) {
+ my ($field, $description, $mailhead) = (FetchSQLData());
+ push(@headerlist, $field);
+ $defmailhead{$field} = $mailhead;
+ $fielddescription{$field} = $description;
+ }
+ SendSQL("SELECT " . join(',', @::log_columns) . ", lastdiffed, now() " .
+ "FROM bugs WHERE bug_id = $id");
+ my @row = FetchSQLData();
+ foreach my $i (@::log_columns) {
+ $values{$i} = shift(@row);
+ }
+ my ($start, $end) = (@row);
+ $values{'cc'} = ShowCcList($id);
+
+
+ $values{'assigned_to'} = DBID_to_name($values{'assigned_to'});
+ $values{'reporter'} = DBID_to_name($values{'reporter'});
+ if ($values{'qa_contact'}) {
+ $values{'qa_contact'} = DBID_to_name($values{'qa_contact'});
+ }
+
+ my @diffs;
+
+
+ SendSQL("SELECT profiles.login_name, fielddefs.description, " .
+ " bug_when, oldvalue, newvalue " .
+ "FROM bugs_activity, fielddefs, profiles " .
+ "WHERE bug_id = $id " .
+ " AND fielddefs.fieldid = bugs_activity.fieldid " .
+ " AND profiles.userid = who " .
+ " AND bug_when > '$start' " .
+ " AND bug_when <= '$end' " .
+ "ORDER BY bug_when"
+ );
+
+ while (MoreSQLData()) {
+ my @row = FetchSQLData();
+ push(@diffs, \@row);
+ }
+
+ my $difftext = "";
+ my $lastwho = "";
+ foreach my $ref (@diffs) {
+ my ($who, $what, $when, $old, $new) = (@$ref);
+ if ($who ne $lastwho) {
+ $lastwho = $who;
+ $difftext .= "\n$who changed:\n\n";
+ $difftext .= FormatTriple("What ", "Old Value", "New Value");
+ $difftext .= ('-' x 76) . "\n";
+ }
+ $difftext .= FormatTriple($what, $old, $new);
+ }
+
+ $difftext = trim($difftext);
+
+
+ my $newcomments = GetLongDescription($id, $start, $end);
+
+ my $count = 0;
+ for my $person ($values{'assigned_to'}, $values{'reporter'},
+ split(/,/, $values{'cc'}),
+ @forcecc) {
+ $count++;
+ if ($seen{$person}) {
+ next;
+ }
+
+ SendSQL("SELECT userid, emailnotification, newemailtech," .
+ " groupset & $values{'groupset'} " .
+ "FROM profiles WHERE login_name = " . SqlQuote($person));
+ my ($userid, $emailnotification, $newemailtech,
+ $groupset) = (FetchSQLData());
+ if (!$newemailtech || !Param('newemailtech')) {
+ next;
+ }
+ $seen{$person} = 1;
+ if ($groupset ne $values{'groupset'}) {
+ next;
+ }
+ if ($emailnotification eq "ExcludeSelfChanges" &&
+ lc($person) eq $nametoexclude) {
+ $didexclude = 1;
+ next;
+ }
+ if ($emailnotification eq "CCOnly" && $count < 3) {
+ next;
+ }
+
+ my %mailhead = %defmailhead;
+
+# SendSQL("SELECT name, mailhead, maildiffs FROM diffprefs, fielddefs WHERE fielddefs.fieldid = diffprefs.fieldid AND userid = $userid");
+# while (MoreSQLData()) {
+# my ($field, $h, $d) = (FetchSQLData());
+# $mailhead{$field} = $h;
+# $maildiffs{$field} = $d;
+# }
+
+# my $maxlen = 0;
+# foreach my $f (keys %mailhead) {
+# if ($mailhead{$f}) {
+# my $l = length($fielddescription{$f});
+# if ($maxlen < $l) {
+# $maxlen = $l;
+# }
+# }
+# }
+
+ my $head = "";
+
+ foreach my $f (@headerlist) {
+ if ($mailhead{$f}) {
+ my $value = $values{$f};
+ if (!defined $value) {
+ # Probaby ought to whine or something. ###
+ next;
+ }
+ my $desc = $fielddescription{$f};
+ $head .= FormatDouble($desc, $value);
+
+# my $extra = $maxlen - length($desc);
+# $head .= ($extra x " ");
+# $head .= $desc . ": ";
+# while (1) {
+# if (length($value) < 70) {
+# $head .= $value . "\n";
+# last;
+# }
+# my $pos = rindex($value, " ", 70);
+# if ($pos < 0) {
+# $pos = rindex($value, ",", 70);
+# if ($pos < 0) {
+# $pos = 70;
+# }
+# }
+# $head .= substr($value, 0, 70) . "\n";
+# $head .= (($extra + 2) x " ");
+# $value = substr($value, 70);
+# }
+ }
+ }
+ if ($difftext eq "" && $newcomments eq "") {
+ # Whoops, no differences!
+ next;
+ }
+
+ my $isnew = ($start !~ m/[1-9]/);
+
+ my %substs;
+ $substs{"neworchanged"} = $isnew ? "New" : "Changed";
+ $substs{"to"} = $person;
+ $substs{"cc"} = '';
+ $substs{"bugid"} = $id;
+ if ($isnew) {
+ $substs{"diffs"} = $head . "\n\n" . $newcomments;
+ } else {
+ $substs{"diffs"} = $difftext . "\n\n" . $newcomments;
+ }
+ $substs{"summary"} = $values{'short_desc'};
+
+ # my $template = Param("changedmail");
+ my $template = "From: bugzilla-daemon
+To: %to%
+Cc: %cc%
+Subject: [Bug %bugid%] %neworchanged% - %summary%
+
+%urlbase%show_bug.cgi?id=%bugid%
+
+%diffs%";
+
+ my $msg = PerformSubsts(Param("changedmail"), \%substs);
+ open(SENDMAIL, "|/usr/lib/sendmail -t") ||
+ die "Can't open sendmail";
+
+ print SENDMAIL trim($msg);
+ close SENDMAIL;
+ push(@sentlist, $person);
+ }
+
+
+
+
+
+ SendSQL("UPDATE bugs SET lastdiffed = '$end', delta_ts = delta_ts " .
+ "WHERE bug_id = $id");
+}
+
+
+
sub ProcessOneBug {
my $i = $_[0];
+ NewProcessOneBug($i);
my $old = "shadow/$i";
my $new = "shadow/$i.tmp.$$";
my $diffs = "shadow/$i.diffs.$$";
print SENDMAIL $msg;
close SENDMAIL;
+ foreach my $n (split(/[, ]+/, "$tolist,$cclist")) {
+ if ($n ne "") {
+ push(@sentlist, $n);
+ }
+ }
+
$logstr = "$logstr; mail sent to $tolist, $cclist";
- print "<B>Email sent to:</B> $tolist $cclist\n";
+ }
+ if (@sentlist) {
+ print "<B>Email sent to:</B> " . join(", ", @sentlist) . "\n";
if ($didexclude) {
print "<B>Excluding:</B> $nametoexclude (<a href=changepassword.cgi>change your preferences</a> if you wish not to be excluded)\n";
}
print "$i ";
}
%seen = ();
+ @sentlist = ();
}
# Code starts here
ConnectToDatabase();
+GetVersionTable();
Lock();
if (open(FID, "<data/nomail")) {
Status("Checking activity table");
-SendSQL("select bug_id,who from bugs_activity");
+SendSQL("select bug_id,who,fieldid from bugs_activity");
+
+my @fieldids;
while (@row = FetchSQLData()) {
- my ($id, $who) = (@row);
+ my ($id, $who, $f) = (@row);
if (!defined $bugid{$id}) {
Alert("Bad bugid " . BugLink($id));
}
if (!defined $profid{$who}) {
Alert("Bad who $who in " . BugLink($id));
}
+ $fieldids[$f] = 1;
}
+for (my $f = 0 ; $f < @fieldids ; $f++) {
+ if ($fieldids[$f]) {
+ SendSQL("SELECT name FROM fielddefs WHERE fieldid = $f");
+ my $name = FetchOneColumn();
+ if (!$name) {
+ Alert("Bad fieldid $f in bugs_activity");
+ }
+ }
+}
Status("Checking dependency table");
projects / thirdparty / bugzilla.git / commitdiff
