- move cyrus, shellcommands, CP exports exports to new-style

- skeleton files for vpopmail exports
- documentation updates
- add big schema diagram to docs

1 files changed, 8 insertions, 13 deletions

diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index 58ac85e..d998c1d 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -69,22 +69,17 @@ sub cp_command { #subroutine, not method
       );
     }
 
+    my $other = 'F';
     if ( $new_password =~ /^\*SUSPENDED\* (.*)$/ ) {
       $new_password = $1;
-      cp_command($host, $port, $username, $password, 'set_mailbox_status',
-        Domain       => $domain,
-        Mailbox      => $new_username,
-        Other        => 'T',
-        Other_Bounce => 'T',
-      );
-    } else {
-      cp_command($host, $port, $username, $password, 'set_mailbox_status',
-        Domain       => $domain,
-        Mailbox      => $new_username,
-        Other        => 'F',
-        Other_Bounce => 'F',
-      );
+      $other = 'T';
     }
+    cp_command($host, $port, $username, $password, 'set_mailbox_status',
+      Domain       => $domain,
+      Mailbox      => $new_username,
+      Other        => $other,
+      Other_Bounce => $other,
+    );
 
     if ( $old_password ne $new_password ) {
       cp_command($host, $port, $username, $password, 'change_mailbox',