[bira]

RobRAC,

I checked tubedogg's hack and there's no reason the two hacks should collide, provided you insert the code right.

Here's what you need to make sure:

If you already hacked the file register.php then the end result should be like this.

Find (in the ORIGINAL file):

  if ($verifyemail) {
    $getjoindate=$DB_site->query_first("SELECT joindate FROM user WHERE userid='$userid'");
    $activateid=$getjoindate[joindate];

    eval("\$message = \"".gettemplate("email_activateaccount",1,0)."\";");
    eval("\$subject = \"".gettemplate("emailsubject_activateaccount",1,0)."\";");

    mail ($email,$subject,$message,"From: \"$bbtitle Mailer\" <$webmasteremail>");

  }

And CHANGE that to (my hack's addition is in red, and tubedogg's hack addition is in blue):

  if ($verifyemail) {
    if ($randpassword=="0") {
        $getjoindate=$DB_site->query_first("SELECT joindate FROM user WHERE userid='$userid'");
        $activateid=$getjoindate[joindate];
    
        eval("\$message = \"".gettemplate("email_activateaccount",1,0)."\";");
        eval("\$subject = \"".gettemplate("emailsubject_activateaccount",1,0)."\";");
    } else {
        eval("\$message = \"".gettemplate("email_lostpw",1,0)."\";");
        eval("\$subject = \"".gettemplate("emailsubject_lostpw",1,0)."\";");   
    }

    mail ($email,$subject,$message,"From: \"$bbtitle Mailer\" <$webmasteremail>");

  }

  // send a welcome email using email_welcome and emailsubject_welcome templates, but don't
  //   send it now if they need to activate their account
    if ($welcomeuser) {
      eval("\$message = \"".gettemplate("email_welcome",1,0)."\";");
      eval("\$subject = \"".gettemplate("emailsubject_welcome",1,0)."\";");
  
      mail($newuseremail,$subject,$message,"From: \"$bbtitle Mailer\" <$webmasteremail>");
    }
  // end send mail

That's it. The two hacks don't even "meet" at any other point


By the way, out of curiosity: if you are using email verification, be it with activation code or with random password, why on earth do you need a separate Welcome E-mail? Simply add your welcome message and whatever text you want to the already existing e-mail templates that are sent to the new users.