novabbs
/
rocksolid-light
3
0
Fork 1
Code Issues 22 Pull Requests Releases Wiki Activity

Minor mods for interBBS Mail.

This commit is contained in:
Retro_Guy 2023-08-10 06:22:26 -07:00
parent a7223ecbcb
commit 5e699cae94
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Rocksolid_Light/rslight/scripts/interBBS_mail.php
View File

@ -473,7 +473,8 @@ function send_keys_to_group($res, $rslight_gpg) {
$body=''; $body='';
$body.="You may use this to import the public key for $domain.\n"; $body.="You may use this to import the public key for $domain.\n";
$body.="This message is automatically generated by $from.\n\n"; $body.="This message is automatically generated by $from.\n";
$body.="for inter-bbs mail exchange for Rocksolid Light.\n\n";
$body.="This message was signed using the following key:\n"; $body.="This message was signed using the following key:\n";
$body.="$signing_key\n\n"; $body.="$signing_key\n\n";

4
Rocksolid_Light/spoolnews/mail.php
View File

@ -336,7 +336,7 @@ echo '</table>';
// Get target domain (then get key if necessary) // Get target domain (then get key if necessary)
$info = preg_split('/@/', $recipient, 2); $info = preg_split('/@/', $recipient, 2);
$target['domain'] = $info[1]; $target['domain'] = $info[1];
if(gnupg_keyinfo($res, $target['domain']) == false) { // We don't have the key if(gnupg_keyinfo($res, "rslight@".$target['domain']) == false) { // We don't have the key
$retrieve = retrieve_key($res, $target['domain']); $retrieve = retrieve_key($res, $target['domain']);
if($retrieve == false) { // We can't get the key if($retrieve == false) { // We can't get the key
return false; return false;
@ -350,7 +350,7 @@ echo '</table>';
gnupg_addsignkey($res,$fingerprint_clean); gnupg_addsignkey($res,$fingerprint_clean);
gnupg_adddecryptkey($res,$fingerprint_clean, ''); gnupg_adddecryptkey($res,$fingerprint_clean, '');
$keyinfo = gnupg_keyinfo($res, $target['domain']); $keyinfo = gnupg_keyinfo($res, "rslight@".$target['domain']);
$target['fingerprint'] = $keyinfo[0]['subkeys'][0]['fingerprint']; $target['fingerprint'] = $keyinfo[0]['subkeys'][0]['fingerprint'];
$encrypt_to_key = $target['fingerprint']; $encrypt_to_key = $target['fingerprint'];
gnupg_addencryptkey($res,$encrypt_to_key); gnupg_addencryptkey($res,$encrypt_to_key);