bug 773: Whitespace at EOL and indentation bug-773
authorBenny Baumann <BenBE@geshi.org>
Tue, 17 Jun 2014 20:56:21 +0000 (22:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 17 Jun 2014 21:01:27 +0000 (23:01 +0200)
CommModule/client.pl

index 1803cd2..bc8919d 100755 (executable)
@@ -1025,28 +1025,27 @@ sub RevokeCerts($$)
       {
         $dbh->do("update `$table` set `revoked`=now() where `id`='".$row{'id'}."'");
 
-       if($org eq "")
-       {
-           if($server)
-           {
-               my @a=$dbh->selectrow_array("select `memid` from `domains` where `id`='".int($row{domid})."'");
-               sendRevokeMail($a[0],  $row{'CN'}, $row{'serial'});
-           }
-           else
-           {
-               sendRevokeMail($row{memid},  $row{'CN'}, $row{'serial'});
-           }
-       }
-       else
-       {
-           my $orgsth = $dbh->prepare("select `memid` from `org` where `orgid`='".int($row{orgid})."'");
-           $orgsth->execute();
-           while ( my ($memid) = $orgsth->fetchrow_array() )
-           {
-               sendRevokeMail($memid,  $row{'CN'}, $row{'serial'});
-           }
-
-       }
+        if($org eq "")
+        {
+          if($server)
+          {
+            my @a=$dbh->selectrow_array("select `memid` from `domains` where `id`='".int($row{domid})."'");
+            sendRevokeMail($a[0],  $row{'CN'}, $row{'serial'});
+          }
+          else
+          {
+            sendRevokeMail($row{memid}, $row{'CN'}, $row{'serial'});
+          }
+        }
+        else
+        {
+          my $orgsth = $dbh->prepare("select `memid` from `org` where `orgid`='".int($row{orgid})."'");
+          $orgsth->execute();
+          while ( my ($memid) = $orgsth->fetchrow_array() )
+          {
+            sendRevokeMail($memid, $row{'CN'}, $row{'serial'});
+          }
+        }
       }
 
     }
@@ -1065,20 +1064,18 @@ sub sendRevokeMail()
     my $certName = $_[1];
     my $serial = $_[2];
     setUsersLanguage($memid);
-    
+
     my %user=getUserData($memid);
-    
+
     my $body = _("Hi")." $user{fname},\n\n";
     $body .= sprintf(_("Your certificate for '%s' with the serial number '%s' has been revoked, as per request.")."\n\n", $certName, $serial);
     $body .= _("Best regards")."\n"._("CAcert.org Support!")."\n\n";
     SysLog("Sending email to ".$user{"email"}."\n") if($debug);
     sendmail($user{email}, "[CAcert.org] "._("Your certificate"), $body, "support\@cacert.org", "", "", "CAcert Support");
-
 }
 
 
 
-
 sub HandleGPG()
 {
   my $sth = $dbh->prepare("select * from gpg where crt='' and csr!='' ");