Remove MailPoet ownership

awesomemotive · Jul 3, 2021 · 82f63ff · 82f63ff
1 parent be6ae8d
commit 82f63ff
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 148 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ Please insure to be conform with the development guidelines.
 ## Getting Started
 
 * Submit a ticket for your issue, assuming one does not already exist or fix an issue
-  * Raise it on our [Issue Tracker](https://github.com/mailpoet/wp-mail-logging/issues)
+  * Raise it on our [Issue Tracker](https://github.com/kgjerstad/wp-mail-logging/issues)
   * Clearly describe the issue including steps to reproduce the bug.
   * Make sure you fill in the earliest version that you know has the issue as well as the version of WordPress you're using.
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -4,7 +4,7 @@ module.exports = function (grunt) {
         pkg: grunt.file.readJSON('package.json'),
         shell: {
             composer: {
-                command: 'composer install --no-dev --no-scripts --prefer-dist'
+                command: './composer install --no-dev --no-scripts --prefer-dist'
             },
             git_checkout: {
                 command: 'git checkout-index -a -f --prefix=build/'
@@ -24,7 +24,7 @@ module.exports = function (grunt) {
         },
         run: {
             tool: {
-                cmd: 'composer'
+                cmd: './composer'
             }
         },
         copyto: {
@@ -125,7 +125,7 @@ module.exports = function (grunt) {
         },
         'github-release': {
             options: {
-                repository: 'No3x/wp-mail-logging', // Path to repository
+                repository: 'kgjerstad/wp-mail-logging', // Path to repository
                 auth: grunt.file.readJSON('credentials.json'),
                 release: {
                     tag_name: 'release/<%= pkg.version %>',

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# :envelope: wp-mail-logging [![Build Status](https://travis-ci.org/No3x/wp-mail-logging.png?branch=master)](https://travis-ci.org/No3x/wp-mail-logging) [![codecov](https://codecov.io/gh/No3x/wp-mail-logging/branch/master/graph/badge.svg)](https://codecov.io/gh/No3x/wp-mail-logging) [![Join the chat at https://gitter.im/No3x/wp-mail-logging](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/No3x/wp-mail-logging?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# :envelope: wp-mail-logging [![Build Status](https://travis-ci.org/kgjerstad/wp-mail-logging.png?branch=master)](https://travis-ci.org/kgjerstad/wp-mail-logging) [![codecov](https://codecov.io/gh/kgjerstad/wp-mail-logging/branch/master/graph/badge.svg)](https://codecov.io/gh/kgjerstad/wp-mail-logging) [![Join the chat at https://gitter.im/kgjerstad/wp-mail-logging](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kgjerstad/wp-mail-logging?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 ## Welcome ##
 wp-mail-logging is a WordPress plugin that logs each mail sent by WordPress.
 
@@ -7,7 +7,7 @@ wp-mail-logging is a WordPress plugin that logs each mail sent by WordPress.
 Install the plugin from the official [Wordpress Plugin Repository](https://wordpress.org/plugins/wp-mail-logging/).
 
 ## Bugs ##
-If you find an issue, let us know in the [Tracker](https://github.com/mailpoet/wp-mail-logging/issues?state=open)!
+If you find an issue, let us know in the [Tracker](https://github.com/kgjerstad/wp-mail-logging/issues?state=open)!
 
 ## Contributions ##
 Anyone is welcome to contribute to wp-mail-logging. Please create an pull request for each change you want to contribute.

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "WordPress plugin that logs each email sent by WordPress.",
     "type": "wordpress-plugin",
     "keywords": ["mail", "email", "log", "logging", "debug", "list", "store", "collect", "view"],
-    "homepage": "https://github.com/mailpoet/wp-mail-logging",
+    "homepage": "https://github.com/kgjerstad/wp-mail-logging",
     "require": {
         "php": ">=5.4"
     },
@@ -21,8 +21,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/mailpoet/wp-mail-logging/issues",
-        "source": "https://github.com/mailpoet/wp-mail-logging/releases"
+        "issues": "https://github.com/kgjerstad/wp-mail-logging/issues",
+        "source": "https://github.com/kgjerstad/wp-mail-logging/releases"
 
     },
     "extra": {

diff --git a/languages/wp-mail-logging-de_DE.mo b/languages/wp-mail-logging-de_DE.mo
diff --git a/languages/wp-mail-logging-zh_CN.mo b/languages/wp-mail-logging-zh_CN.mo
diff --git a/languages/wp-mail-logging.pot b/languages/wp-mail-logging.pot
@@ -1,14 +1,14 @@
-# Copyright (C) 2019 Christian Z&ouml;ller
+# Copyright (C) 2021 Wysija
 # This file is distributed under the GPLv3.
 msgid ""
 msgstr ""
-"Project-Id-Version: WP Mail Logging 1.9.7\n"
+"Project-Id-Version: WP Mail Logging 1.9.8\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-mail-logging\n"
-"POT-Creation-Date: 2019-04-18 13:01:12+00:00\n"
+"POT-Creation-Date: 2021-07-03 13:37:23+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2021-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "X-Generator: grunt-wp-i18n 0.5.4\n"
@@ -40,7 +40,7 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: src/Renderer/WPML_ColumnManager.php:36 src/WPML_OptionsManager.php:504
+#: src/Renderer/WPML_ColumnManager.php:36 src/WPML_OptionsManager.php:503
 msgid "Message"
 msgstr ""
 
@@ -68,84 +68,72 @@ msgstr ""
 msgid "No email found."
 msgstr ""
 
-#: src/WPML_LifeCycle.php:205
+#: src/WPML_LifeCycle.php:205 src/WPML_OptionsManager.php:444
 msgid "Settings"
 msgstr ""
 
 #: src/WPML_OptionsManager.php:328 src/WPML_OptionsManager.php:329
 msgid "WP Mail Log"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:340 src/WPML_OptionsManager.php:341
-#: src/WPML_OptionsManager.php:352
+#: src/WPML_OptionsManager.php:339 src/WPML_OptionsManager.php:340
+#: src/WPML_OptionsManager.php:360
 msgid "About"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:429
-msgid "About Plugin"
-msgstr ""
-
-#: src/WPML_OptionsManager.php:438
-msgid "More information"
-msgstr ""
-
-#: src/WPML_OptionsManager.php:439
-msgid "Plugin Homepage/support"
-msgstr ""
-
-#: src/WPML_OptionsManager.php:440
-msgid "Plugin author's blog"
-msgstr ""
-
-#: src/WPML_OptionsManager.php:447
+#: src/WPML_OptionsManager.php:349
 msgid "Entries per page"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:469
+#: src/WPML_OptionsManager.php:415 src/WPML_OptionsManager.php:478
 msgid "You do not have sufficient permissions to access this page."
 msgstr ""
 
-#: src/WPML_OptionsManager.php:478
+#: src/WPML_OptionsManager.php:426
 msgid "Log"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:521
+#: src/WPML_OptionsManager.php:440
+msgid "Email log"
+msgstr ""
+
+#: src/WPML_OptionsManager.php:520
 msgid "Close"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:535
+#: src/WPML_OptionsManager.php:534
 msgid "Search"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:560
+#: src/WPML_OptionsManager.php:558
 msgid "true"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:562
+#: src/WPML_OptionsManager.php:560
 msgid "false"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:565
+#: src/WPML_OptionsManager.php:563
 msgid "Administrator"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:567
+#: src/WPML_OptionsManager.php:565
 msgid "Editor"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:569
+#: src/WPML_OptionsManager.php:567
 msgid "Author"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:571
+#: src/WPML_OptionsManager.php:569
 msgid "Contributor"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:573
+#: src/WPML_OptionsManager.php:571
 msgid "Subscriber"
 msgstr ""
 
-#: src/WPML_OptionsManager.php:575
+#: src/WPML_OptionsManager.php:573
 msgid "Anyone"
 msgstr ""
 
@@ -346,4 +334,4 @@ msgstr ""
 #: src/inc/class-wp-list-table.php:573
 msgctxt "paging"
 msgid "%1$s of %2$s"
-msgstr ""
+msgstr ""
diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "wp-mail-logging",
-  "version": "1.9.7",
+  "version": "1.9.8",
   "description": "WordPress plugin that logs each email sent by WordPress.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/mailpoet/wp-mail-logging"
+    "url": "https://github.com/kgjerstad/wp-mail-logging"
   },
   "author": "No3x",
   "license": "GPL-2.0",
   "bugs": {
-    "url": "https://github.com/mailpoet/wp-mail-logging/issues"
+    "url": "https://github.com/kgjerstad/wp-mail-logging/issues"
   },
   "devDependencies": {
     "gitignore-to-glob": "^0.1.2",

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Requires at least: 5.0
 Tested up to: 5.5
-Stable tag: 1.9.7
+Stable tag: 1.9.8
 
 Log every single email sent by WordPress. Zero configuration. Entirely free.
 

diff --git a/src/WPML_OptionsManager.php b/src/WPML_OptionsManager.php
@@ -415,8 +415,6 @@ public function LogMenu() {
             wp_die(__('You do not have sufficient permissions to access this page.', 'wp-mail-logging'));
         }
 
-        $this->redirectToFreePlan();
-
         if (!class_exists( 'Email_Log_List_Table' ) ) {
             require_once ( plugin_dir_path( __FILE__ ) . 'WPML_Email_Log_List.php' );
         }
@@ -537,98 +535,9 @@ public function _LogMenu() {
                 $emailLogList->display();
                 ?>
             </form>
-            <?php
-            /**
-            * Control whether the banner is displayed or not
-            *
-            * @since 1.9.7
-            *
-            * @param boolean $display Whether the banner should be displayed. (default: true)
-            * 
-            * @return boolean
-            */
-            $display = apply_filters('wpml_banner_display', true);
-            if ( $display ) {
-                $this->displayMP3Banner();
-            }
-            ?>
-        <?php
-    }
-
-    private function displayMP3Banner() {
-        $option = (int)get_option('wpml_banner_version');
-        if (!$option) {
-            $option = rand(1, 2);
-            add_option('wpml_banner_version', $option);
-        }
-        ?>
-        <div style="background: #fff;border-left: 4px solid #fff;border-radius: 10px;box-shadow: 0 4px 35px rgba(195, 65, 2, .2);clear: both;margin-bottom: 15px;margin-top: 15px;padding: 20px;">
-            <h3><?php _e( 'Reliable and beautiful emails by MailPoet!', 'wp-mail-logging' );?></h3>
-            <?php
-              if ($option === 1) {
-                    $this->displayMP3BannerVersionA();
-              } else {
-                    $this->displayMP3BannerVersionB();
-              }
-            ?>
-        </div>
-        <?php
-    }
-
-    private function displayMP3BannerVersionA() {
-        ?>
-            <ul style="list-style-type:disc;list-style-position: inside">
-                <li><?php _e( '50 email templates to choose from', 'wp-mail-logging' );?></li>
-                <li><?php _e( 'Fun email designer', 'wp-mail-logging' );?></li>
-                <li><?php _e( 'Automated email marketing', 'wp-mail-logging' );?></li>
-                <li><?php _e( 'WooCommerce emails', 'wp-mail-logging' );?></li>
-                <li><?php _e( '99.1% success email deliverability', 'wp-mail-logging' );?></li>
-                <li><?php _e( 'Fast and friendly support', 'wp-mail-logging' );?></li>
-                <li><?php _e( 'Over 100,000 active users', 'wp-mail-logging' );?></li>
-            </ul>
-            <a
-                class="button button-primary"
-                href="?page=wpml_plugin_log&redirect=free-plan&ref=wml_1"
-                target="_blank"
-            >
-                <?php _e( 'Try MailPoet for free', 'wp-mail-logging' );?>
-            </a>
-            <p>
-                <?php _e( 'Testimonial', 'wp-mail-logging' );?>:
-                <i>
-                    <?php _e( 'Thanks for this awesome plugin, love love love how it integrates with WordPress. I seriously spent days if not weeks on Mailchimp, and still haven’t been able to do what I did on MailPoet in 1 hour!', 'wp-mail-logging' );?>
-                </i>
-                — Kida Shey
-            </p>
         <?php
     }
 
-    private function displayMP3BannerVersionB() {
-        ?>
-        <p>
-            <?php _e( 'Create beautiful email campaigns and reach your audience in a breeze with the MailPoet  plugin. MailPoet is used by over 300,000 website owners making it the most popular email marketing solution in WordPress. Send beautiful newsletter, notify your readers about last articles and increase your WooCommerce sales!', 'wp-mail-logging' );?>
-        </p>
-        <p>
-            <a href="?page=wpml_plugin_log&redirect=free-plan&ref=wml_2" target="_blank" class="button button-primary">
-                <?php _e( 'Discover MailPoet for free', 'wp-mail-logging' );?>
-            </a>
-        </p>
-        <?php
-    }
-
-    private function redirectToFreePlan() {
-        if (
-            is_array($_GET)
-            && array_key_exists('redirect', $_GET)
-            && array_key_exists('ref', $_GET)
-            && $_GET['redirect'] === 'free-plan'
-        ) {
-            add_option('MAILPOET_REFERRAL_ID', 'wml');
-            wp_redirect( 'https://www.mailpoet.com/free-plan?ref=' . $_GET['ref'] );
-            exit;
-        }
-    }
-
     /**
      * Override this method and follow its format.
      * The purpose of this method is to provide i18n display strings for the values of options.

diff --git a/src/inc/redux/WPML_Redux_Framework_config.php b/src/inc/redux/WPML_Redux_Framework_config.php
@@ -334,7 +334,7 @@ public function setArguments() {
 
             // SOCIAL ICONS -> Setup custom links in the footer for quick links in your panel footer icons.
             $this->args['share_icons'][] = array(
-                'url'   => 'https://github.com/mailpoet/wp-mail-logging',
+                'url'   => 'https://github.com/kgjerstad/wp-mail-logging',
                 'title' => 'Visit us on GitHub',
                 'icon'  => 'el-icon-github'
                 //'img'   => '', // You can use icon OR img. IMG needs to be a full URL.

diff --git a/wp-mail-logging.php b/wp-mail-logging.php
@@ -1,11 +1,11 @@
 <?php
 /*
    Plugin Name: WP Mail Logging
-   Plugin URI: http://wordpress.org/extend/plugins/wp-mail-logging/
-   Support URI: https://github.com/mailpoet/wp-mail-logging/issues
-   Version: 1.9.7
-   Author: MailPoet
-   Author URI: https://www.mailpoet.com/
+   Plugin URI: https://wordpress.org/plugins/wp-mail-logging/
+   Support URI: https://github.com/kgjerstad/wp-mail-logging/issues
+   Version: 1.9.8
+   Author: Wysija
+   Author URI: https://profiles.wordpress.org/wysija/
    Description: Logs each email sent by WordPress.
    Text Domain: wp-mail-logging
    License: GPLv3