From: Michal Vaner <vorner@ucw.cz>
Date: Mon, 13 Oct 2008 14:13:45 +0000 (+0200)
Subject: Indentation of text in notifications
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=0f56177f9485580e2eb0d2f558a74f452d2d8063;p=pciids.git

Indentation of text in notifications
---

diff --git a/PciIds/Notifications.pm b/PciIds/Notifications.pm
index e8fa12b..83eaeae 100644
--- a/PciIds/Notifications.pm
+++ b/PciIds/Notifications.pm
@@ -41,6 +41,14 @@ sub sendNotif( $$$ ) {
 		"$message\nThis is automatic notification message, do not respond to it.\nYou can change your notifications at http://$config{hostname}/mods/PC/?action=notifications\n" );
 }
 
+sub indent( $$ ) {
+	my( $text, $count ) = @_;
+	return '' unless defined $text;
+	my $ident = ' 'x$count;
+	$text =~ s/\n/$ident/s;
+	return $text;
+}
+
 sub sendOut( $$ ) {
 	my( $notifs, $sendFun ) = @_;
 	my( $last_address, $last_user );
@@ -58,7 +66,8 @@ sub sendOut( $$ ) {
 		if( $reason == 0 ) {
 			$note = "New item was created.\n  Id: ".$addr->pretty()."\n  Name: $newname\n";
 			$note .= "  Description: $newdesc\n" if( defined $newdesc && ( $newdesc ne '' ) );
-			$note .= "  Comment text: $text\n" if( defined $text && ( $text ne '' ) );
+			$text = indent( $text, 4 );
+			$note .= "  Comment text: $text\n" if $text ne '';
 			$note .= "  Author: $author\n" if( defined $author && ( $author ne '' ) );
 			$note .= "  Time: $time\n";
 			$note .= "  Address: http://".$config{'hostname'}."/read/".$addr->get()."\n";
@@ -72,7 +81,8 @@ sub sendOut( $$ ) {
 			$note .= "    Proposed name: $newname\n" if( defined $newname && ( $newname ne '' ) );
 			$note .= "    Deletion request\n" if defined $newname && $newname eq '';
 			$note .= "    Proposed description: $newdesc\n" if( defined $newdesc && ( $newdesc ne '' ) );
-			$note .= "    Text: $text\n" if( defined $text && ( $text ne '' ) );
+			$text = indent( $text, 6 );
+			$note .= "    Text: $text\n" if $text ne '';
 			$note .= "    Author: $author\n" if( defined $author && ( $author ne '' ) );
 			$note .= "    Time: $time\n";
 		} elsif( $reason == 2 ) {
@@ -80,7 +90,8 @@ sub sendOut( $$ ) {
 				$note = "Item name approved.\n  Id: ".$addr->pretty()."\n";
 				$note .= "  Name: $newname\n";
 				$note .= "  Description: $newdesc\n" if( defined $newdesc && ( $newdesc ne '' ) );
-				$note .= "  Comment text: $text\n" if( defined $text && ( $text ne '' ) );
+				$text = indent( $text, 4 );
+				$note .= "  Comment text: $text\n" if $text ne '';
 				$note .= "  Address: http://".$config{'hostname'}."/read/".$addr->get()."\n";
 			} else {
 				$note = "Item deletion approved.\n  Id: ".$addr->pretty()."\n";