(cp 6e45a8f42) fixes #2281 use template for reset/activation mail

and change is_first_connection to has_already_logged_in for better naming

include/functions_mail.inc.php

@@ -1039,7 +1039,7 @@ function pwg_generate_reset_password_mail($username, $password_link, $gallery_ti
   return array(
     'subject' => '['.$gallery_title.'] '.l10n('Password Reset'),
     'content' => $message,
-    'email_format' => 'text/plain',
+    'content_format' => 'text/plain',
     );
 }
 
@@ -1078,7 +1078,7 @@ function pwg_generate_set_password_mail($username, $set_password_link, $gallery_
   return array(
     'subject' => l10n('Welcome to ') . '['.$gallery_title.']',
     'content' => $message,
-    'email_format' => 'text/plain',
+    'content_format' => 'text/plain',
     );
 }