template for list.info, use sendmail to subscribe, use archive if exist

Author: gnadelwartz

majordomo/create_list.cgi

@@ -44,15 +44,26 @@ $in{'footer'} =~ s/\r//g;
 &set_permissions("$ldir/$in{'name'}");
 &unlock_file("$ldir/$in{'name'}");
 
+
+
 # Have majordomo create the new config file, by fooling the wrapper
 # into thinking it has received an email with a resend command
+#$lfile = "$ldir/$in{'name'}.config";
+#$cmd = "$wrapper_program_path resend -l $in{'name'} nobody";
+#open(WRAPPER, "|$cmd nobody >/dev/null 2>&1");
+#print WRAPPER "config $in{'name'} $in{'password'}\n\n";
+#close(WRAPPER);
+#&additional_log("exec", $cmd);
+#sleep(3);
+
+# use provided template, majordomo provides onyl minimal needed config
 $lfile = "$ldir/$in{'name'}.config";
-$cmd = "$wrapper_program_path resend -l $in{'name'} nobody";
-open(WRAPPER, "|$cmd nobody >/dev/null 2>&1");
-print WRAPPER "config $in{'name'} $in{'password'}\n\n";
-close(WRAPPER);
-&additional_log("exec", $cmd);
-sleep(3);
+# copy listdir template to list.info, fallback copy from template.dist
+if ( ! -f "template/list.config") { &copy_source_dest("template/list.config.dist","template/list.config"); }
+if ( ! -f "template/list.config") { &error("No default template found: template/list.config"); }
+if ( ! -f "$lfile") { &copy_source_dest("template/list.config", $lfile); }
+if ( ! -f "$lfile") { &error("Could not create list config: $file"); }
+&set_permissions("$lfile");
 
 # create the .info file
 &lock_file($lfile);
@@ -72,7 +83,10 @@ if (&find_value("date_info", $list) eq "yes") {
 # create the archive directory
 $adir = &perl_var_replace(&find_value("filedir", $conf), $conf);
 $aext = &perl_var_replace(&find_value("filedir_suffix", $conf), $conf);
-if ($adir && $aext) {
+if( -d "$adir") {
+	 $arch = "$adir/$in{'name'}";
+}
+elsif ($adir && $aext) {
 	&lock_file("$adir/$in{'name'}$aext");
 	mkdir("$adir/$in{'name'}$aext", 0755);
 	&set_permissions("$adir/$in{'name'}$aext");

majordomo/save_members.cgi

@@ -34,34 +34,50 @@ if ($in{'update'}) {
 	&webmin_log("members", undef, $in{'name'});
 	}
 elsif ($in{'add'}) {
-	# call majordomo to subscribe an address
+	# call send_mail to subscribe an address
 	$pass || &error($text{'members_esub'});
 	$in{'addr_a'} =~ /^(\S+)\@(\S+)\.(\S+)$/ ||
 		&error($text{'members_esubaddr'});
-	open(WRAPPER, "|$wrapper_path majordomo");
-	printf WRAPPER "From: %s\n\n",
-		$owner ? $owner : $in{'addr_a'};
-	print WRAPPER "approve $pass subscribe $in{'name'} $in{'addr_a'}\n\n";
-	close(WRAPPER);
-	sleep(1);
+	$mail=sprintf("From: %s\nTo: %s\nSubject: subcribe\n\n",
+		$owner ? $owner : $in{'addr_a'}, "majordomo");
+	$mail .= "approve $pass subscribe $in{'name'} $in{'addr_a'}\n\n";
+	&send_mail($mail);
 	&unlock_file($list->{'members'});
 	&webmin_log("subscribe", undef, $in{'name'},
 		    { 'addr' => $in{'addr_a'} });
 	}
 elsif ($in{'remove'}) {
-	# call majordomo to unsubscribe an address
+	# call send_mail to unsubscribe an address
 	$pass || &error($text{'members_eunsub'});
 	$in{'addr_r'} =~ /^(\S+)\@(\S+)\.(\S+)$/ ||
 		&error($text{'members_eunsubaddr'});
-	open(WRAPPER, "|$wrapper_path majordomo");
-	printf WRAPPER "From: %s\n\n",
-		$owner ? $owner : $in{'addr_r'};
-	print WRAPPER "approve $pass unsubscribe $in{'name'} $in{'addr_r'}\n\n";
-	close(WRAPPER);
-	sleep(1);
+        $mail=sprintf("From: %s\nTo: %s\nSubject: unsubcribe\n\n",
+                $owner ? $owner : $in{'addr_a'}, "majordomo");
+        $mail .= "approve $pass unsubscribe $in{'name'} $in{'addr_r'}\n\n";
+        &send_mail($mail);
 	&unlock_file($list->{'members'});
 	&webmin_log("unsubscribe", undef, $in{'name'},
 		    { 'addr' => $in{'addr_r'} });
 	}
 &redirect("edit_list.cgi?name=$in{'name'}");
 
+sub send_mail
+   {
+   local $sent,$mail=$_[0];
+   if (!$sent) {
+        # Try to send the email by calling sendmail -t
+        %sconfig = &foreign_config("sendmail");
+        $sendmail = $sconfig{'sendmail_path'} ? $sconfig{'sendmail_path'}
+                                              : &has_command("sendmail");
+        if (-x $sendmail && open(MAIL, "| $sendmail -t")) {
+                print MAIL $mail;
+                if (close(MAIL)) {
+                        $sent = 2;
+                        }
+                }
+        }
+
+   if (!$sent) {
+	&error($text{'global_esendmail'}, "");
+	}
+   }