Please take our Survey
logo       
<prev   next>

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

[mb-commits] r7680 - mb_server/trunk/cgi-bin: msg#00286

audio.musicbrainz.cvs

Subject: [mb-commits] r7680 - mb_server/trunk/cgi-bin

Author: keschte
Date: 2006-05-26 17:59:10 +0000 (Fri, 26 May 2006)
New Revision: 7680

Modified:
mb_server/trunk/cgi-bin/UserStuff.pm
Log:
mod->edit, moderator->editor.


Modified: mb_server/trunk/cgi-bin/UserStuff.pm
===================================================================
--- mb_server/trunk/cgi-bin/UserStuff.pm 2006-05-26 17:58:19 UTC (rev
7679)
+++ mb_server/trunk/cgi-bin/UserStuff.pm 2006-05-26 17:59:10 UTC (rev
7680)
@@ -416,7 +416,7 @@
);
}

-# Used by /login.html, /user/edit.html and /user/confirmaddress.html
+# Used by /login.html, /user/edit.html and /user/sendverification.html
sub SetUserInfo
{
my ($self, %opts) = @_;
@@ -625,13 +625,13 @@

my $type = "";

- $type = '<a
href="http://wiki.musicbrainz.org/AutoModerator";>AutoModerator</a>'
+ $type = '<a href="/doc/AutoEditor">AutoEditor</a>'
if ($this->IsAutoMod($privs));

$type = "Internal/Bot User"
if ($this->IsBot($privs));

- $type .= ', <a
href="http://wiki.musicbrainz.org/RelationshipEditor";>RelationshipEditor</a>'
+ $type .= ', <a href="/doc/RelationshipEditor">RelationshipEditor</a>'
if ($this->IsLinkModerator($privs));

$type = "Normal User"
@@ -745,8 +745,8 @@
my $t = time;
my $chk = $self->GetVerifyChecksum($email, $self->GetId, $t);

- "http://"; . &DBDefs::WEB_SERVER . "/user/confirmaddress.html"
- . "?uid=" . $self->GetId
+ "http://"; . &DBDefs::WEB_SERVER . "/user/verifyemail.html"
+ . "?userid=" . $self->GetId
. "&email=" . uri_escape($email)
. "&time=$t"
. "&chk=" . uri_escape($chk)
@@ -797,7 +797,7 @@

# Send an address verification e-mail for a user to the specified address.
# Used by htdocs/(createlogin|login|moderator).html
-# and htdocs/user/send-email-confirmation.html
+# and htdocs/user/sendverification.html

sub SendVerificationEmail
{
@@ -806,13 +806,13 @@
my $url = $self->GetEmailActivationLink($email);

my $body = <<EOF;
-This is the email confirmation for your MusicBrainz account.
-Please click on the link below to verify your email address:
+This is the a verification e-mail for your MusicBrainz account.
+Please click on the link below to verify your e-mail address:

$url

-If clicking on the link does not work, you may need to cut and paste
-the link into your web browser manually.
+If clicking the link directly does not work, you may need to manually cut and
paste
+the link into the location bar of your preferred web browser.

Thanks for using MusicBrainz!

@@ -821,11 +821,11 @@

require MusicBrainz::Server::Mail;
my $mail = MusicBrainz::Server::Mail->new(
- Sender => 'Webserver <webserver@xxxxxxxxxxxxxxx>',
+ Sender => 'MusicBrainz Server
<webserver@xxxxxxxxxxxxxxx>',
From => 'MusicBrainz <noreply@xxxxxxxxxxxxxxx>',
To =>
MusicBrainz::Server::Mail->format_address_line($self->GetName, $email),
"Reply-To" => 'MusicBrainz Support
<support@xxxxxxxxxxxxxxx>',
- Subject => "email address verification",
+ Subject => "Please verify your e-mail address",
Type => "text/plain",
Encoding => "quoted-printable",
Data => $body,
@@ -861,31 +861,40 @@

if ($opts{'revealaddress'})
{
+
$body .= <<EOF;
-If you would like to send mail to moderator '$fromname',
+If you would like to send an e-mail to editor '$fromname',
either reply to this e-mail, or use this link:
http://${\ DBDefs::WEB_SERVER() }/user/mod_email.html?uid=${\ $self->GetId }
EOF
- } elsif ($self->GetEmail) {
+
+ }
+ elsif ($self->GetEmail)
+ {
+
$body .= <<EOF;
-Please do not respond to this email.
+Please do not respond to this e-mail.

-If you would like to send mail to moderator '$fromname',
+If you would like to send an e-mail to editor '$fromname',
please use this link:
http://${\ DBDefs::WEB_SERVER() }/user/mod_email.html?uid=${\ $self->GetId }
EOF
- } elsif ($self->GetId != &ModDefs::MODBOT_MODERATOR) {
+
+ }
+ elsif ($self->GetId != &ModDefs::MODBOT_MODERATOR)
+ {
+
$body .= <<EOF;
-Please do not respond to this email.
+Please do not respond to this e-mail.

-Unfortunately moderator '$fromname' has not supplied their e-mail address,
-so you can't reply to them.
+Unfortunately editor '$fromname' has not supplied their e-mail address,
+therefore you cannot reply to them.
EOF
}

require MusicBrainz::Server::Mail;
my $mail = MusicBrainz::Server::Mail->new(
- Sender => 'Webserver <webserver@xxxxxxxxxxxxxxx>',
+ Sender => 'MusicBrainz Server
<webserver@xxxxxxxxxxxxxxx>',
From => $self->GetForwardingAddressHeader,
# To: $other_user (automatic)
"Reply-To" => 'Nobody <noreply@xxxxxxxxxxxxxxx>',
@@ -905,24 +914,24 @@
$other_user->SendFormattedEmail(entity => $mail);
}

-# User $self has added a note to $mod. $mod_user was the original moderator.
+# User $self has added a note to $mod. $edit_user was the original editor.

sub SendModNoteToUser
{
my ($self, %opts) = @_;
- my $mod = $opts{'mod'};
- my $mod_user = $opts{'mod_user'};
+ my $edit = $opts{'mod'};
+ my $edit_user = $opts{'mod_user'};
my $note_text = $opts{'note_text'};

- my $modid = $mod->GetId;
+ my $editid = $edit->GetId;
my $fromname = $self->GetName;

my $body = <<EOF;
-Moderator '$fromname' has attached a note to your moderation #$modid:
+Editor '$fromname' has attached a note to your edit #$editid:

$note_text

-Moderation link: http://${\ DBDefs::WEB_SERVER() }/showmod.html?modid=$modid
+Direct link to this edit: http://${\ DBDefs::WEB_SERVER()
}/show/edit/?editid=$editid

------------------------------------------------------------------------
EOF
@@ -931,35 +940,44 @@

if ($opts{'revealaddress'})
{
+
$body .= <<EOF;
-If you would like to send mail to moderator '$fromname',
+If you would like to send an e-mail to editor '$fromname',
either reply to this e-mail, or use this link:
http://${\ DBDefs::WEB_SERVER() }/user/mod_email.html?uid=${\ $self->GetId }
EOF
- } elsif ($self->GetEmail) {
+
+ }
+ elsif ($self->GetEmail)
+ {
+
$body .= <<EOF;
-Please do not respond to this email.
+Please do not respond to this e-mail.

-If you would like to send mail to moderator '$fromname',
+If you would like to send an e-mail to editor '$fromname',
please use this link:
http://${\ DBDefs::WEB_SERVER() }/user/mod_email.html?uid=${\ $self->GetId }
EOF
- } elsif ($self->GetId != &ModDefs::MODBOT_MODERATOR) {
+
+ }
+ elsif ($self->GetId != &ModDefs::MODBOT_MODERATOR)
+ {
+
$body .= <<EOF;
-Please do not respond to this email.
+Please do not respond to this e-mail.

-Unfortunately moderator '$fromname' has not supplied their e-mail address,
-so you can't reply to them.
+Unfortunately editor '$fromname' has not supplied their e-mail address,
+so you cannot reply to them.
EOF
}

require MusicBrainz::Server::Mail;
my $mail = MusicBrainz::Server::Mail->new(
- Sender => 'Webserver <webserver@xxxxxxxxxxxxxxx>',
+ Sender => 'MusicBrainz Server
<webserver@xxxxxxxxxxxxxxx>',
From => $self->GetForwardingAddressHeader,
- # To: $mod_user (automatic)
+ # To: $edit_user (automatic)
"Reply-To" => 'Nobody <noreply@xxxxxxxxxxxxxxx>',
- Subject => "Note added to your moderation #$modid",
+ Subject => "Note added to your edit #$edit",
Type => "text/plain",
Encoding => "quoted-printable",
Data => $body,
@@ -972,30 +990,30 @@
$mail->delete("Reply-To");
}

- $mod_user->SendFormattedEmail(entity => $mail);
+ $edit_user->SendFormattedEmail(entity => $mail);
}

-# User $self has added a note to $mod. $mod_user was the original moderator.
+# User $self has added a note to $mod. $edit_user was the original editor.
# $other_user is a third user, who has already added a note to $mod.

sub SendModNoteToFellowNoter
{
my ($self, %opts) = @_;
- my $mod = $opts{'mod'};
- my $mod_user = $opts{'mod_user'};
+ my $edit = $opts{'mod'};
+ my $edit_user = $opts{'mod_user'};
my $other_user = $opts{'other_user'};
my $note_text = $opts{'note_text'};

- my $modid = $mod->GetId;
+ my $editid = $edit->GetId;
my $fromname = $self->GetName;

my $body = <<EOF;
-Moderator '$fromname' has attached a note to moderation #$modid:
+Editor '$fromname' has attached a note to edit #$edit:

$note_text

-Moderation link: http://${\ DBDefs::WEB_SERVER() }/showmod.html?modid=$modid
-The original moderator was '${\ $mod_user->GetName }'
+Direct link to this edit: http://${\ DBDefs::WEB_SERVER()
}/show/edit/?editid=$editid
+The original editor was: '${\ $edit_user->GetName }'

------------------------------------------------------------------------
EOF
@@ -1005,34 +1023,34 @@
if ($opts{'revealaddress'})
{
$body .= <<EOF;
-If you would like to send mail to moderator '$fromname',
+If you would like to send an e-mail to editor '$fromname',
either reply to this e-mail, or use this link:
http://${\ DBDefs::WEB_SERVER() }/user/mod_email.html?uid=${\ $self->GetId }
EOF
} elsif ($self->GetEmail) {
$body .= <<EOF;
-Please do not respond to this email.
+Please do not respond to this e-mail.

-If you would like to send mail to moderator '$fromname',
+If you would like to send an e-mail to editor '$fromname',
please use this link:
http://${\ DBDefs::WEB_SERVER() }/user/mod_email.html?uid=${\ $self->GetId }
EOF
} elsif ($self->GetId != &ModDefs::MODBOT_MODERATOR) {
$body .= <<EOF;
-Please do not respond to this email.
+Please do not respond to this e-mail.

-Unfortunately moderator '$fromname' has not supplied their e-mail address,
-so you can't reply to them.
+Unfortunately editor '$fromname' has not supplied their e-mail address,
+so you cannott reply to them.
EOF
}

require MusicBrainz::Server::Mail;
my $mail = MusicBrainz::Server::Mail->new(
- Sender => 'Webserver <webserver@xxxxxxxxxxxxxxx>',
+ Sender => 'MusicBrainz Server
<webserver@xxxxxxxxxxxxxxx>',
From => $self->GetForwardingAddressHeader,
# To: $other_user (automatic)
"Reply-To" => 'Nobody <noreply@xxxxxxxxxxxxxxx>',
- Subject => "Note added to moderation #$modid",
+ Subject => "Note added to edit #$edit",
Type => "text/plain",
Encoding => "quoted-printable",
Data => $body,
@@ -1067,7 +1085,7 @@
my $mailer = MusicBrainz::Server::Mail->open(
$from,
$to,
- ) or return "Could not send mail. Please try again later.";
+ ) or return "Could not send the e-mail. Please try again later.";

if ($opts{'entity'})
{
@@ -1075,7 +1093,9 @@
print $mailer "To: " . $self->GetRealAddressHeader . "\n"
unless $entity->get("To");
$entity->print($mailer);
- } elsif ($opts{'text'}) {
+ }
+ elsif ($opts{'text'})
+ {
my $messagetext = $opts{'text'};
my $i = index($messagetext, "\n\n");
my $headers = substr($messagetext, 0, $i+1);
@@ -1085,7 +1105,7 @@
}

my $ok = close $mailer;
- $ok ? undef : "Failed to send mail. Please try again later.";
+ $ok ? undef : "Failed to send the e-mail. Please try again later.";
}


################################################################################
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [mb-commits] r7679 - mb_server/trunk/htdocs/mod, root
Next by Date:  [mb-commits] r7681 - mb_server/trunk/htdocs/css, root
Previous by Thread:  [mb-commits] r7679 - mb_server/trunk/htdocs/mod, root
Next by Thread:  [mb-commits] r7681 - mb_server/trunk/htdocs/css, root
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
Recently Viewed:
qplus.devel/200...    network.jabber....    debian.qa-packa...    encryption.gpg....    python.dabo.dev...    uclinux.devel/2...    science.mathema...    recreation.pesc...    kernel.ck/2004-...    mozilla.devel.e...    tex.latex.prosp...    ietf.multi6/200...    bbc.cvs/2002-11...    xfree86.newbie/...    jakarta.taglibs...    altlinux.hardwa...    comedi/2002-05/...    horde.bugs/2004...    games.diplomacy...    finance.e-gold....    web.dom.test-su...    lang.ruby.rails...    os.netbsd.devel...    video.gstreamer...   
Home | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe

Navigation