Merge "Bug #1097564 Include contact information"

htdocs/auth/lib.php

@@ -1512,7 +1512,7 @@ function ensure_user_account_is_active($user=null) {
         if ($dologout) {
             $user->logout();
         }
-        die_info(get_string('accountexpired'));
+        die_info(get_string('accountexpired', 'mahara', get_config('wwwroot')));
     }
 
     // Check if the user's account has been suspended

htdocs/lang/en.utf8/mahara.php

@@ -182,7 +182,7 @@ $string['accesstotallydenied_institutionsuspended'] = 'Your institution %s has b
 Please contact your institution for help.';
 $string['accessforbiddentoadminsection'] = 'You are forbidden from accessing the administration section.';
 $string['accountdeleted'] = 'Sorry, your account has been deleted.';
-$string['accountexpired'] = 'Sorry, your account has expired.';
+$string['accountexpired'] = 'Sorry, your account has expired. You can <a href="%scontact.php">contact the site administrator</a> to have it reactivated.';
 $string['accountcreated'] = '%s: New account';
 $string['accountcreatedtext'] = 'Dear %s,