Merge branch 'release/v2.0.0'

.gitignore

@@ -0,0 +1,3 @@
+vendor
+node_modules
+plugin/vendor

Gruntfile.js

@@ -0,0 +1,22 @@
+
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+
+    // Copy
+    copy: {
+      composer: {
+        expand: true,
+        src: 'vendor/**',
+        dest: 'plugin/'
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-copy');
+
+  grunt.registerTask('default', [
+    'copy:composer'
+  ]);
+};

composer.json

@@ -0,0 +1,20 @@
+{
+    "name": "korobochkin/mark-user-as-spammer",
+    "description": "The ability to mark specific users as spammers like on Multisite install.",
+    "type": "wordpress-plugin",
+    "license": "GPLv2 or later",
+    "authors": [
+        {
+            "name": "Kolya Korobochkin",
+            "email": "[email protected]",
+            "homepage": "http://korobochkin.com"
+        }
+    ],
+    "minimum-stability": "stable",
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "Korobochkin\\MarkUserAsSpammer\\": "source/"
+        }
+    }
+}

package.json

@@ -0,0 +1,31 @@
+{
+  "name": "mark-user-as-spammer",
+  "version": "2.0.0",
+  "description": "The ability to mark specific users as spammers like on Multisite install.",
+  "main": "Gruntfile.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/korobochkin/mark-user-as-spammer.git"
+  },
+  "keywords": [
+    "wordpress",
+    "plugin",
+    "spam",
+    "spammer",
+    "users",
+    "administrator"
+  ],
+  "author": "Kolya Korobochkin",
+  "license": "GPL-2.0+",
+  "bugs": {
+    "url": "https://github.com/korobochkin/mark-user-as-spammer/issues"
+  },
+  "homepage": "https://github.com/korobochkin/mark-user-as-spammer#readme",
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-contrib-copy": "^0.8.0"
+  }
+}

plugin/languages/mark_user_as_spammer-ru_RU.po

@@ -1,95 +1,138 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mark User as Spammer\n"
-"POT-Creation-Date: 2015-03-29 01:09+0300\n"
-"PO-Revision-Date: 2015-03-29 01:13+0300\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mark-user-as-"
+"spammer\n"
+"POT-Creation-Date: 2015-11-03 21:37+0300\n"
+"PO-Revision-Date: 2015-11-03 21:39+0300\n"
 "Last-Translator: Kolya Korobochkin <[email protected]>\n"
 "Language-Team: Kolya Korobochkin\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.6\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_n:1,2;__ngettext_noop:1,2;"
 "_n_noop:1,2;_c,_nc:4c,1,2;_x:1,2c;_nx:4c,1,2;_nx_noop:4c,1,2;_ex:1,2c;"
-"esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;"
-"esc_html_x:1,2c\n"
+"esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SearchPath-0: ..\n"
 
-#: ../plugin.php:36
-msgid "<strong>ERROR</strong>: Your account has been marked as a spammer."
+#: source/Admin/AdminNotices.php:31
+msgctxt "%1$s - the account (user) ID (number)"
+msgid "An error occured during blocking account with ID <code>%1$d</code>."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:37
+msgctxt "%1$s - the account (user) ID (number)"
+msgid ""
+"Account with ID <code>%1$d</code> have been successfully banned and no "
+"longer log in."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:46
+msgctxt "%1$s - the account (user) ID (number)"
+msgid "An error occured during unblocing account with ID <code>%1$d</code>."
 msgstr ""
 
-#: ../plugin.php:73
+#: source/Admin/AdminNotices.php:52
+msgctxt "%1$s - the account (user) ID (number)"
+msgid ""
+"Account with ID <code>%1$d</code> have been successfully unbanned and now "
+"can log in."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:59
+msgid "An error occured during something in Mark User as Spammer plugin."
+msgstr ""
+"Произошла неизвестная ошибка внутри плагина Mark User as Spammer в момент, "
+"когда он пытался что-то сделать."
+
+#: source/Admin/LoadUsersPage.php:28
+msgid "You do not have the permission to do that!"
+msgstr "У вас недостаточно прав для этого действия."
+
+#: source/Admin/RowActions/User.php:48
 msgctxt "Verb. Mark user (account) like non spammer account"
 msgid "Unban user. He will be able to log in on site."
 msgstr "Разблокировать пользователя. Он сможет авторизовываться на сайте."
 
-#: ../plugin.php:75
+#: source/Admin/RowActions/User.php:50
 msgctxt "Verb. Mark user (account) like spammer account"
 msgid ""
 "Ban user. He will not be able to log in on site and get an error that his "
 "account marked as spammer."
 msgstr ""
-"Заблокировать пользователя. Он не сможет авторизовываться на сайте и "
-"увидит ошибку о том, что его аккаунт заблокирован, как спам-аккаунт."
+"Заблокировать пользователя. Он не сможет авторизовываться на сайте и увидит "
+"ошибку о том, что его аккаунт заблокирован, как спам-аккаунт."
 
-#: ../plugin.php:79
+#: source/Admin/RowActions/User.php:53
 msgctxt "Verb. Mark user (account) like non spammer account"
 msgid "Unban"
 msgstr "Разблокировать"
 
-#: ../plugin.php:81
+#: source/Admin/RowActions/User.php:55
 msgctxt "Verb. Mark user (account) like spammer account"
 msgid "Ban"
 msgstr "Заблокировать"
 
-#: ../plugin.php:111
-msgid "You do not have the permission to do that!"
-msgstr "У вас недостаточно прав для этого действия."
+#: source/Authenticate/Authenticate.php:19
+msgid "<strong>ERROR</strong>: Your account has been marked as a spammer."
+msgstr "<strong>ОШИБКА</strong>: Ваш аккаунт отмечен как спам-аккаунт."
 
-#: ../plugin.php:175
-#, php-format
-msgctxt "%1$s - the account (user) ID (number)"
-msgid "An error occured during blocking account with ID <code>%1$s</code>."
-msgstr ""
-"Произошла ошибка во время блокировки аккаунта с ID <code>%1$s</code>."
+#. Plugin Name of the plugin/theme
+msgid "Mark User as Spammer"
+msgstr "Mark User as Spammer"
 
-#: ../plugin.php:181
-#, php-format
-msgctxt "%1$s - the account (user) ID (number)"
+#. Plugin URI of the plugin/theme
+#. Author URI of the plugin/theme
+msgid "http://korobochkin.com/"
+msgstr "http://korobochkin.com/"
+
+#. Description of the plugin/theme
 msgid ""
-"Account with ID <code>%1$s</code> have been successfully banned and no "
-"longer log in."
+"The ability to mark specific users as spammers like on Multisite install. "
+"Right now after account have been banned user can't log in. Even if they "
+"currently have active sessions (and admin area currently open) they will be "
+"force log out without opportunity to log in again."
 msgstr ""
-"Аккаунт с ID <code>%1$s</code> успешно заблокирован и теперь не сможет "
-"авторизоваться на сайте."
+"Возможность помечать аккаунты как спамерские (по аналогии с функционалом "
+"Мультисайта). Сразу после блокировки аккаунта пользователь не сможет "
+"авторизоваться. Даже если он в настоящее время пользователь авторизован (и "
+"открыта какая-нибудь страница в административной части WordPress) он будет "
+"принудительно «выброшен» без возможности авторизоваться снова."
 
-#: ../plugin.php:190
-#, php-format
-msgctxt "%1$s - the account (user) ID (number)"
-msgid "An error occured during unblocing account with ID <code>%1$s</code>."
-msgstr ""
-"Произошла ошибка во время разблокирования аккаунта с ID <code>%1$s</code>."
+#. Author of the plugin/theme
+msgid "Kolya Korobochkin"
+msgstr "Коля Коробочкин"
 
-#: ../plugin.php:196
-#, php-format
-msgctxt "%1$s - the account (user) ID (number)"
-msgid ""
-"Account with ID <code>%1$s</code> have been successfully unbanned and now "
-"can log in."
-msgstr ""
-"Аккаунт с ID <code>%1$s</code> успешно разблокирован и теперь может "
-"авторизоваться на сайте."
+#~ msgctxt "%1$s - the account (user) ID (number)"
+#~ msgid "An error occured during blocking account with ID <code>%1$s</code>."
+#~ msgstr ""
+#~ "Произошла ошибка во время блокировки аккаунта с ID <code>%1$s</code>."
 
-#: ../plugin.php:203
-msgid "An error occured during something in Mark User as Spammer plugin."
-msgstr ""
-"Произошла неизвестная ошибка внутри плагина Mark User as Spammer в "
-"момент, когда он пытался что-то сделать."
+#~ msgctxt "%1$s - the account (user) ID (number)"
+#~ msgid ""
+#~ "Account with ID <code>%1$s</code> have been successfully banned and no "
+#~ "longer log in."
+#~ msgstr ""
+#~ "Аккаунт с ID <code>%1$s</code> успешно заблокирован и теперь не сможет "
+#~ "авторизоваться на сайте."
+
+#~ msgctxt "%1$s - the account (user) ID (number)"
+#~ msgid "An error occured during unblocing account with ID <code>%1$s</code>."
+#~ msgstr ""
+#~ "Произошла ошибка во время разблокирования аккаунта с ID <code>%1$s</code>."
+
+#~ msgctxt "%1$s - the account (user) ID (number)"
+#~ msgid ""
+#~ "Account with ID <code>%1$s</code> have been successfully unbanned and now "
+#~ "can log in."
+#~ msgstr ""
+#~ "Аккаунт с ID <code>%1$s</code> успешно разблокирован и теперь может "
+#~ "авторизоваться на сайте."

plugin/languages/mark_user_as_spammer.pot

@@ -0,0 +1,95 @@
+# Copyright (C) 2015 Mark User as Spammer
+# This file is distributed under the same license as the Mark User as Spammer package.
+msgid ""
+msgstr ""
+"Project-Id-Version: Mark User as Spammer 2.0.0\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mark-user-as-"
+"spammer\n"
+"POT-Creation-Date: 2015-11-03 18:22:38+00:00\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+
+#: source/Admin/AdminNotices.php:31
+msgctxt "%1$s - the account (user) ID (number)"
+msgid "An error occured during blocking account with ID <code>%1$d</code>."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:37
+msgctxt "%1$s - the account (user) ID (number)"
+msgid ""
+"Account with ID <code>%1$d</code> have been successfully banned and no "
+"longer log in."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:46
+msgctxt "%1$s - the account (user) ID (number)"
+msgid "An error occured during unblocing account with ID <code>%1$d</code>."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:52
+msgctxt "%1$s - the account (user) ID (number)"
+msgid ""
+"Account with ID <code>%1$d</code> have been successfully unbanned and now "
+"can log in."
+msgstr ""
+
+#: source/Admin/AdminNotices.php:59
+msgid "An error occured during something in Mark User as Spammer plugin."
+msgstr ""
+
+#: source/Admin/LoadUsersPage.php:28
+msgid "You do not have the permission to do that!"
+msgstr ""
+
+#: source/Admin/RowActions/User.php:48
+msgctxt "Verb. Mark user (account) like non spammer account"
+msgid "Unban user. He will be able to log in on site."
+msgstr ""
+
+#: source/Admin/RowActions/User.php:50
+msgctxt "Verb. Mark user (account) like spammer account"
+msgid ""
+"Ban user. He will not be able to log in on site and get an error that his "
+"account marked as spammer."
+msgstr ""
+
+#: source/Admin/RowActions/User.php:53
+msgctxt "Verb. Mark user (account) like non spammer account"
+msgid "Unban"
+msgstr ""
+
+#: source/Admin/RowActions/User.php:55
+msgctxt "Verb. Mark user (account) like spammer account"
+msgid "Ban"
+msgstr ""
+
+#: source/Authenticate/Authenticate.php:19
+msgid "<strong>ERROR</strong>: Your account has been marked as a spammer."
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+msgid "Mark User as Spammer"
+msgstr ""
+
+#. #-#-#-#-#  mark-user-as-spammer.pot (Mark User as Spammer 2.0.0)  #-#-#-#-#
+#. Plugin URI of the plugin/theme
+#. #-#-#-#-#  mark-user-as-spammer.pot (Mark User as Spammer 2.0.0)  #-#-#-#-#
+#. Author URI of the plugin/theme
+msgid "http://korobochkin.com/"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"The ability to mark specific users as spammers like on Multisite install. "
+"Right now after account have been banned user can't log in. Even if they "
+"currently have active sessions (and admin area currently open) they will be "
+"force log out without opportunity to log in again."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Kolya Korobochkin"
+msgstr ""