Author: fapeeler
Date: Tue Jul 13 15:01:48 2010
New Revision: 963750

URL: http://svn.apache.org/viewvc?rev=963750&view=rev
Log:
VCL-139

Removed preferred name from all notifications. Not really needed.


Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/image.pm
    incubator/vcl/trunk/managementnode/lib/VCL/inuse.pm
    incubator/vcl/trunk/managementnode/lib/VCL/makeproduction.pm
    incubator/vcl/trunk/managementnode/lib/VCL/new.pm
    incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm

Modified: incubator/vcl/trunk/managementnode/lib/VCL/image.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/image.pm?rev=963750&r1=963749&r2=963750&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/image.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/image.pm Tue Jul 13 15:01:48 2010
@@ -91,7 +91,6 @@ sub process {
        my $reservation_id             = $self->data->get_reservation_id();
        my $user_id                    = $self->data->get_user_id();
        my $user_unityid               = $self->data->get_user_login_id();
-       my $user_preferredname         = $self->data->get_user_preferred_name();
        my $user_email                 = $self->data->get_user_email();
        my $affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
@@ -288,7 +287,6 @@ sub reservation_successful {
        my $reservation_id             = $self->data->get_reservation_id();
        my $user_id                    = $self->data->get_user_id();
        my $user_unityid               = $self->data->get_user_login_id();
-       my $user_preferredname         = $self->data->get_user_preferred_name();
        my $user_email                 = $self->data->get_user_email();
        my $affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
@@ -305,7 +303,7 @@ sub reservation_successful {
 
        # Send image creation successful email to user
        my $body_user = <<"END";
-$user_preferredname,
+
 Your VCL image creation request for $image_prettyname has
 succeeded.  Please visit $affiliation_sitewwwaddress and
 you should see an image called $image_prettyname.
@@ -371,7 +369,6 @@ sub reservation_failed {
        my $reservation_id             = $self->data->get_reservation_id();
        my $user_id                    = $self->data->get_user_id();
        my $user_unityid               = $self->data->get_user_login_id();
-       my $user_preferredname         = $self->data->get_user_preferred_name();
        my $user_email                 = $self->data->get_user_email();
        my $affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
@@ -391,7 +388,7 @@ sub reservation_failed {
 
        # Send mail to user
        my $body_user = <<"END";
-$user_preferredname,
+
 We apologize for the inconvenience.
 Your image creation of $image_prettyname has been delayed
 due to a system issue that prevented the automatic completion.

Modified: incubator/vcl/trunk/managementnode/lib/VCL/inuse.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=963750&r1=963749&r2=963750&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/inuse.pm Tue Jul 13 15:01:48 2010
@@ -569,7 +569,6 @@ sub _notify_user_endtime {
        # Store hash variables into local variables
        my $request_id                 = $request_data->{id};
        my $reservation_id             = $request_data->{RESERVATIONID};
-       my $user_preferredname         = $request_data->{user}{preferredname};
        my $user_email                 = $request_data->{user}{email};
        my $user_emailnotices          = $request_data->{user}{emailnotices};
        my $user_im_name               = $request_data->{user}{IMtype}{name};
@@ -584,7 +583,7 @@ sub _notify_user_endtime {
        my $computer_shortname         = 
$request_data->{reservation}{$reservation_id}{computer}{SHORTNAME};
 
        my $message = <<"EOF";
-$user_preferredname,
+
 You have $notice_interval until the end of your reservation for image 
$image_prettyname.
 
 Reservation extensions are available if the machine you are on does not have a 
reservation immediately following.
@@ -655,7 +654,6 @@ sub _notify_user_disconnect {
        # Store hash variables into local variables
        my $request_id                 = $request_data->{id};
        my $reservation_id             = $request_data->{RESERVATIONID};
-       my $user_preferredname         = $request_data->{user}{preferredname};
        my $user_email                 = $request_data->{user}{email};
        my $user_emailnotices          = $request_data->{user}{emailnotices};
        my $user_im_name               = $request_data->{user}{IMtype}{name};
@@ -682,7 +680,7 @@ sub _notify_user_disconnect {
        }
 
        my $message = <<"EOF";
-$user_preferredname,
+
 You have $disconnect_string until the end of your reservation for image 
$image_prettyname, please save all work and prepare to exit.
 
 Reservation extensions are available if the machine you are on does not have a 
reservation immediately following.
@@ -706,7 +704,7 @@ To disable email notices
 ******************************************************************
 EOF
 
-       my $short_message = "$user_preferredname, You have $disconnect_string 
until the end of your reservation. Please save all work and prepare to log 
off.";
+       my $short_message = "You have $disconnect_string until the end of your 
reservation. Please save all work and prepare to log off.";
 
        my $subject = "VCL -- $disconnect_string until end of reservation";
 
@@ -759,7 +757,6 @@ sub _notify_user_timeout {
 
        # Store some hash variables into local variables
        my $reservation_id             = $request_data->{RESERVATIONID};
-       my $user_preferredname         = $request_data->{user}{preferredname};
        my $user_email                 = $request_data->{user}{email};
        my $user_emailnotices          = $request_data->{user}{emailnotices};
        my $user_im_name               = $request_data->{user}{IMtype}{name};
@@ -770,7 +767,7 @@ sub _notify_user_timeout {
        my $computer_ipaddress         = 
$request_data->{reservation}{$reservation_id}{computer}{IPaddress};
 
        my $message = <<"EOF";
-$user_preferredname,
+
 Your reservation has timed out due to inactivity for image $image_prettyname 
at address $computer_ipaddress.
 
 To make another reservation, please revisit:
@@ -828,7 +825,6 @@ sub _notify_user_request_ended {
 
        # Store some hash variables into local variables
        my $reservation_id             = $request_data->{RESERVATIONID};
-       my $user_preferredname         = $request_data->{user}{preferredname};
        my $user_email                 = $request_data->{user}{email};
        my $user_emailnotices          = $request_data->{user}{emailnotices};
        my $user_im_name               = $request_data->{user}{IMtype}{name};
@@ -840,7 +836,7 @@ sub _notify_user_request_ended {
        my $subject = "VCL -- End of reservation";
 
        my $message = <<"EOF";
-$user_preferredname,
+
 Your reservation of $image_prettyname has ended. Thank you for using 
$affiliation_sitewwwaddress.
 
 Regards,

Modified: incubator/vcl/trunk/managementnode/lib/VCL/makeproduction.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/makeproduction.pm?rev=963750&r1=963749&r2=963750&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/makeproduction.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/makeproduction.pm Tue Jul 13 
15:01:48 2010
@@ -207,7 +207,6 @@ sub notify_imagerevision_to_production {
        my $image_prettyname                = 
$self->data->get_image_prettyname();
        my $imagerevision_id                = 
$self->data->get_imagerevision_id();
        my $imagerevision_revision          = 
$self->data->get_imagerevision_revision();
-       my $user_preferredname              = 
$self->data->get_user_preferred_name();
        my $user_affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $user_email                      = $self->data->get_user_email();
        
@@ -217,7 +216,7 @@ sub notify_imagerevision_to_production {
        
        # Assemble the message body
        my $body = <<"END";
-$user_preferredname,
+
 Revision $imagerevision_revision of your VCL '$image_prettyname' image has 
been made production.  Any new reservations for the image will receive this 
revision by default.
 
 If you have any questions, please contact $user_affiliation_helpaddress.

Modified: incubator/vcl/trunk/managementnode/lib/VCL/new.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/new.pm?rev=963750&r1=963749&r2=963750&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/new.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/new.pm Tue Jul 13 15:01:48 2010
@@ -122,7 +122,6 @@ sub process {
        my $managementnode_hostname         = 
$self->data->get_management_node_hostname();
        my $user_unityid                    = $self->data->get_user_login_id();
        my $user_uid                        = $self->data->get_user_uid();
-       my $user_preferredname              = 
$self->data->get_user_preferred_name();
        my $user_affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $user_affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $user_standalone                 = 
$self->data->get_user_standalone();
@@ -498,7 +497,6 @@ sub reload_image {
        my $managementnode_hostname         = 
$self->data->get_management_node_hostname();
        my $user_unityid                    = $self->data->get_user_login_id();
        my $user_uid                        = $self->data->get_user_uid();
-       my $user_preferredname              = 
$self->data->get_user_preferred_name();
        my $user_affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $user_affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $user_standalone                 = 
$self->data->get_user_standalone();
@@ -745,7 +743,6 @@ sub computer_not_being_used {
        my $managementnode_hostname         = 
$self->data->get_management_node_hostname();
        my $user_unityid                    = $self->data->get_user_login_id();
        my $user_uid                        = $self->data->get_user_uid();
-       my $user_preferredname              = 
$self->data->get_user_preferred_name();
        my $user_affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $user_affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $user_standalone                 = 
$self->data->get_user_standalone();
@@ -984,7 +981,6 @@ sub reserve_computer {
        my $managementnode_hostname         = 
$self->data->get_management_node_hostname();
        my $user_unityid                    = $self->data->get_user_login_id();
        my $user_uid                        = $self->data->get_user_uid();
-       my $user_preferredname              = 
$self->data->get_user_preferred_name();
        my $user_affiliation_sitewwwaddress = 
$self->data->get_user_affiliation_sitewwwaddress();
        my $user_affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $user_standalone                 = 
$self->data->get_user_standalone();
@@ -1077,14 +1073,14 @@ sub reserve_computer {
                # Assemble the message body
                if ($request_forimaging) {
                        $mailstring = <<"EOF";
-$user_preferredname,
+
 The resources for your VCL image creation request have been successfully 
reserved.
 
 EOF
                }
                else {
                        $mailstring = <<"EOF";
-$user_preferredname,
+
 The resources for your VCL request have been successfully reserved.
 
 EOF
@@ -1163,7 +1159,7 @@ EOF
                        $subject = "VCL -- $image_prettyname reservation";
 
                        $mailstring = <<"EOF";
-$user_preferredname,
+
 A machine with $image_prettyname has been reserved. Use ssh to connect to 
$computer_ip_address.
 
 Username: your Unity ID

Modified: incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=963750&r1=963749&r2=963750&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm Tue Jul 13 15:01:48 
2010
@@ -527,7 +527,6 @@ sub _notify_user_timeout {
 
        my $request_id                 = $self->data->get_request_id();
        my $reservation_id             = $self->data->get_reservation_id();
-       my $user_preferredname         = $self->data->get_user_preferred_name();
        my $user_email                 = $self->data->get_user_email();
        my $user_emailnotices          = $self->data->get_user_emailnotices();
        my $user_im_name               = $self->data->get_user_imtype_name();
@@ -537,9 +536,8 @@ sub _notify_user_timeout {
        my $image_prettyname           = $self->data->get_image_prettyname();
        my $computer_ip_address        = $self->data->get_computer_ip_address();
 
-       #my 
($emailaddress,$firstname,$type,$ipaddress,$imagename,$url,$IMname,$IMid) = @_;
        my $message = <<"EOF";
-$user_preferredname,
+
 Your reservation has timed out for image $image_prettyname at address 
$computer_ip_address because no initial connection was made.
 
 To make another reservation, please revisit $affiliation_sitewwwaddress.


Reply via email to