Merge remote-tracking branch 'origin/master'

language/english.php

@@ -294,7 +294,7 @@
     11 => 'No User Comments',
     12 => 'User Preferences for',
     13 => 'Email Nightly Digest',
-    14 => 'This password is generated by a randomizer. It is recommended that you change this password immediately. To change your password, log in and then click My Account from the User Functions menu.',
+    14 => 'Since this password was sent by email, it is recommended that you change it immediately. To change your password, log in and then click My Account from the User Functions menu.',
     15 => "Your {$_CONF['site_name']} account has been created successfully. To be able to use it, you must login using the information below. Please save this mail for further reference.",
     'email_convert_remote' => "Your {$_CONF['site_name']} remote account has been converted to a local account. To continue to use your account, you must login using the information below. Please save this mail for further reference.",
     16 => 'Your Account Information',
@@ -478,8 +478,9 @@
     'confirm_new_email' => 'Confirm new email',
     'enter_new_email' => 'Enter New Email',
     'desc_new_email_status' => 'You are required to enter a new email address for your account. You can enter a new email for your account below. <em>Please note you will not be able to do anything with your account until your email is updated and verified.</em>',
-    'email_msg_email_status_1' => "You have updated your email address for your account \"%s\" on {$_CONF['site_name']}, <{$_CONF['site_url']}>.\n\nPlease click on the following link to verify this email address:\n\n",
-    'email_msg_email_status_2' => "If you do not verify this email address and you log into your account you will be required to enter a new email address and go through this email verification process again.\n\n",
+    'email_msg_email_status_1' => "You have updated your email address for your account \"%s\" on {$_CONF['site_name']}, {$_CONF['site_url']}.",
+	'email_msg_verify' => "Please click on the following link to verify this email address:",
+    'email_msg_email_status_2' => "If you do not verify this email address and you log into your account you will be required to enter a new email address and go through this email verification process again.",
     'email_verify' => 'New Email to be Verified',
     'email_verify_delete' => 'Delete email to be verified',
     'email_verify_msg' => "You have previously updated your email address for your account but it still needs to be verified. Please check your email account for an email from {$_CONF['site_name']} that contains a verification link. Once you click on that link your new email address will be verified and your account will be updated to use it.<br" . XHTML . "><br" . XHTML . ">If you wish you may update the new email to be verified with the email fields above or you can delete it.",
@@ -1277,11 +1278,11 @@
     78 => 'Send Reminder',
     79 => 'No User selected for reminders',
     80 => 'Successfully sent Reminders',
-    81 => 'Reminder to verify account for %s',
-    82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not accessed in the next 30 days.",
+    81 => 'Reminder to access your user account on %s',
+    82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not used soon.",
     83 => "Your account on {$_CONF['site_name']} has not been used since it was created and will be deleted soon if not accessed.",
-    84 => "Your login name is: %s  for our site: {$_CONF['site_url']}",
-    85 => 'If you have forgotten the password use the following link: %s',
+    84 => "Your login name is: %s for our site: {$_CONF['site_url']}",
+    85 => 'If you have forgotten the password use the following link: ',
     86 => 'Include',
     87 => 'Reminders',
     88 => 'Default Group',

language/english_utf-8.php

@@ -294,7 +294,7 @@
     11 => 'No User Comments',
     12 => 'User Preferences for',
     13 => 'Email Nightly Digest',
-    14 => 'This password is generated by a randomizer. It is recommended that you change this password immediately. To change your password, log in and then click My Account from the User Functions menu.',
+    14 => 'Since this password was sent by email, it is recommended that you change it immediately. To change your password, log in and then click My Account from the User Functions menu.',
     15 => "Your {$_CONF['site_name']} account has been created successfully. To be able to use it, you must login using the information below. Please save this mail for further reference.",
     'email_convert_remote' => "Your {$_CONF['site_name']} remote account has been converted to a local account. To continue to use your account, you must login using the information below. Please save this mail for further reference.",
     16 => 'Your Account Information',
@@ -478,8 +478,9 @@
     'confirm_new_email' => 'Confirm new email',
     'enter_new_email' => 'Enter New Email',
     'desc_new_email_status' => 'You are required to enter a new email address for your account. You can enter a new email for your account below. <em>Please note you will not be able to do anything with your account until your email is updated and verified.</em>',
-    'email_msg_email_status_1' => "You have updated your email address for your account \"%s\" on {$_CONF['site_name']}, <{$_CONF['site_url']}>.\n\nPlease click on the following link to verify this email address:\n\n",
-    'email_msg_email_status_2' => "If you do not verify this email address and you log into your account you will be required to enter a new email address and go through this email verification process again.\n\n",
+    'email_msg_email_status_1' => "You have updated your email address for your account \"%s\" on {$_CONF['site_name']}, {$_CONF['site_url']}.",
+	'email_msg_verify' => "Please click on the following link to verify this email address:",
+    'email_msg_email_status_2' => "If you do not verify this email address and you log into your account you will be required to enter a new email address and go through this email verification process again.",
     'email_verify' => 'New Email to be Verified',
     'email_verify_delete' => 'Delete email to be verified',
     'email_verify_msg' => "You have previously updated your email address for your account but it still needs to be verified. Please check your email account for an email from {$_CONF['site_name']} that contains a verification link. Once you click on that link your new email address will be verified and your account will be updated to use it.<br" . XHTML . "><br" . XHTML . ">If you wish you may update the new email to be verified with the email fields above or you can delete it.",
@@ -1276,11 +1277,11 @@
     78 => 'Send Reminder',
     79 => 'No User selected for reminders',
     80 => 'Successfully sent Reminders',
-    81 => 'Reminder to verify account for %s',
-    82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not accessed in the next 30 days.",
+    81 => 'Reminder to access your user account on %s',
+    82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not used soon.",
     83 => "Your account on {$_CONF['site_name']} has not been used since it was created and will be deleted soon if not accessed.",
-    84 => "Your login name is: %s  for our site: {$_CONF['site_url']}",
-    85 => 'If you have forgotten the password use the following link: %s',
+    84 => "Your login name is: %s for our site: {$_CONF['site_url']}",
+    85 => 'If you have forgotten the password use the following link: ',
     86 => 'Include',
     87 => 'Reminders',
     88 => 'Default Group',

language/japanese_utf-8.php

@@ -486,8 +486,9 @@
     'confirm_new_email' => 'メールアドレスの確認',
     'enter_new_email' => 'メールアドレスの入力',
     'desc_new_email_status' => 'アカウントのメールアドレスを入力する必要があります。以下にアカウントのメールアドレスを入力してください。<em>メールアドレスが更新され、検証されるまで、あなたのアカウントは使用できません。</em>',
-    'email_msg_email_status_1' => "{$_CONF['site_name']}<{$_CONF['site_url']}> のアカウント \"%s\" のメールアドレスは更新されました。\n\nこのメールアドレスを検証するため、次のリンクをクリックしてください:\n\n",
-    'email_msg_email_status_2' => "このメールアドレスを検証せずにアカウントへログインすると、新しいメールアドレスの入力と検証のプロセスが再度必要になります。\n\n",
+    'email_msg_email_status_1' => "{$_CONF['site_name']}<{$_CONF['site_url']}> のアカウント \"%s\" のメールアドレスは更新されました。",
+	'email_msg_verify' => "このメールアドレスを検証するため、次のリンクをクリックしてください:",
+    'email_msg_email_status_2' => "このメールアドレスを検証せずにアカウントへログインすると、新しいメールアドレスの入力と検証のプロセスが再度必要になります。",
     'email_verify' => '検証対象のメールアドレス',
     'email_verify_delete' => '検証対象のメールアドレスを削除',
     'email_verify_msg' => "あなたのアカウントのメールアドレスは更新されていますが、検証が必要です。{$_CONF['site_name']}から送信された検証用のリンクを含むメールを確認してください。あなたがそのリンクをクリックし、メールアドレスが検証されると、アカウントが有効になります。<br" . XHTML . "><br" . XHTML . ">あなたの希望により、上の入力欄でメールアドレスを更新するか、削除することができます。",
@@ -1290,7 +1291,7 @@
     82 => "あなたの{$_CONF['site_name']}のアカウントは%sからアクセスしていません。今後30日以内にアクセスしないと無効になりますのでご注意ください。",
     83 => "あなたの{$_CONF['site_name']}のアカウントは作成後使用していません。このままアクセスしないと近日中に削除しますのでご注意ください。",
     84 => "あなたのログイン名: %s  サイト名: {$_CONF['site_url']}",
-    85 => 'パスワードを紛失した場合には、以下のリンクをクリックしてください: %s',
+    85 => 'パスワードを紛失した場合には、以下のリンクをクリックしてください: ',
     86 => '含む',
     87 => 'リマインダー',
     88 => 'デフォルトグループ',

plugins/spamx/functions.inc

@@ -561,8 +561,7 @@ function plugin_spamaction_spamx($comment, $action)
     if ($dir = @opendir($spamx_path)) {
         while (($file = readdir($dir)) !== false) {
             if (is_file($spamx_path . $file)) {
-                if ((substr($file, -17) === '.Action.class.php') &&
-                    (stripos($file, 'SLVreport.') !== 0)) {
+                if (substr($file, -17) === '.Action.class.php') {
                     $sfile = str_replace('.Action.class.php', '', $file);
                     require_once $spamx_path . $file;
                     $CM = new $sfile;