Changes in perl/lib/BarnOwl.pm [df569c5:77c87b2]

File:

• perl/lib/BarnOwl.pm (modified) (2 diffs)

perl/lib/BarnOwl.pm

@@ -32 +32 @@
 use BarnOwl::Message;
 use BarnOwl::Style;
-use BarnOwl::Zephyr;
 use BarnOwl::Timer;
 use BarnOwl::Editwin;
@@ -436 +435 @@
 sub default_zephyr_signature
 {
-  if (my $zsig = getvar('zsig')) {
-    return $zsig;
+  my $zsig = getvar('zsig');
+  if (!$zsig && (my $zsigproc = getvar('zsigproc'))) {
+    $zsig = `$zsigproc`;
+  } elsif (!defined($zsig = get_zephyr_variable('zwrite-signature'))) {
+    $zsig = ((getpwuid($<))[6]);
+    $zsig =~ s/,.*//;
   }
-  if (my $zsigproc = getvar('zsigproc')) {
-    return `$zsigproc`;
-  }
-  my $zwrite_signature = get_zephyr_variable('zwrite-signature');
-  if (defined($zwrite_signature)) {
-    return $zwrite_signature;
-  }
-  my $name = ((getpwuid($<))[6]);
-  $name =~ s/,.*//;
-  return $name;
+  chomp($zsig);
+  return $zsig;
 }