Release 3.0.0-rc.1.0.2

New poll [MAILPOET-1018]

lib/Config/Initializer.php

@@ -5,6 +5,7 @@ use MailPoet\API;
 use MailPoet\Cron\CronTrigger;
 use MailPoet\Router;
 use MailPoet\Util\ConflictResolver;
+use MailPoet\Util\Helpers;
 use MailPoet\WP\Notice as WPNotice;
 
 if(!defined('ABSPATH')) exit;
@@ -13,7 +14,8 @@ require_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
 class Initializer {
 
-  const UNABLE_TO_CONNECT = '<strong>Mailpoet:</strong> Unable to connect to the database (the database is unable to open a file or folder), the connection is likely not configured correctly. Please read our <a href="http://beta.docs.mailpoet.com/article/200-solving-database-connection-issues">Knowledge Base article</a> for steps how to resolve it.';
+  const UNABLE_TO_CONNECT = 'Unable to connect to the database (the database is unable to open a file or folder), the connection is likely not configured correctly. Please read our [link] Knowledge Base article [/link] for steps how to resolve it.';
+  const SOLVE_DB_ISSUE_URL = 'http://beta.docs.mailpoet.com/article/200-solving-database-connection-issues';
 
   protected $plugin_initialized = false;
 
@@ -36,7 +38,11 @@ class Initializer {
     try {
       $this->setupDB();
     } catch(\Exception $e) {
-      return WPNotice::displayWarning(self::UNABLE_TO_CONNECT);
+      return WPNotice::displayError(Helpers::replaceLinkTags(
+        __(self::UNABLE_TO_CONNECT, 'mailpoet'),
+        self::SOLVE_DB_ISSUE_URL,
+        array('target' => '_blank')
+      ));
     }
 
     // activation function

lib/Form/Block/Date.php

@@ -79,7 +79,7 @@ class Date extends Base {
         $html .= '</select>';
       } else if($date_selector === 'MM') {
         $block['selected'] = $month;
-        $html .= '<select class="mailpoet_date_month" ';
+        $html .= '<select class="mailpoet_select mailpoet_date_month" ';
         $html .= static::getInputValidation($block, array(
           'required-message' => __('Please select a month', 'mailpoet')
         ));

lib/Form/Block/Submit.php

@@ -8,7 +8,7 @@ class Submit extends Base {
   static function render($block) {
     $html = '';
 
-    $html .= '<p class="mailpoet_submit"><input type="submit" ';
+    $html .= '<p class="mailpoet_paragraph"><input type="submit" class="mailpoet_submit" ';
 
     $html .= 'value="'.static::getFieldLabel($block).'" ';
 

lib/Form/Util/Styles.php

@@ -13,10 +13,11 @@ class Styles {
 
 /* paragraphs (label + input) */
 .mailpoet_paragraph {
-
+  line-height:20px;
 }
 
 /* labels */
+.mailpoet_segment_label,
 .mailpoet_text_label,
 .mailpoet_textarea_label,
 .mailpoet_select_label,
@@ -25,18 +26,35 @@ class Styles {
 .mailpoet_list_label,
 .mailpoet_date_label {
   display:block;
+  font-weight:bold;
 }
 
 /* inputs */
 .mailpoet_text,
 .mailpoet_textarea,
 .mailpoet_select,
+.mailpoet_date_month,
+.mailpoet_date_day,
+.mailpoet_date_year,
 .mailpoet_date {
   display:block;
 }
 
-.mailpoet_checkbox {
+.mailpoet_text,
+.mailpoet_textarea {
+  width:200px;
+}
 
+.mailpoet_checkbox {
+}
+
+.mailpoet_submit input {
+}
+
+.mailpoet_divider {
+}
+
+.mailpoet_message {
 }
 
 .mailpoet_validate_success {

mailpoet.php

@@ -4,7 +4,7 @@ if(!defined('ABSPATH')) exit;
 
 /*
  * Plugin Name: MailPoet 3 (new)
- * Version: 3.0.0-rc.1.0.1
+ * Version: 3.0.0-rc.1.0.2
  * Plugin URI: http://www.mailpoet.com
  * Description: Create and send newsletters, post notifications and welcome emails from your WordPress.
  * Author: MailPoet
@@ -21,7 +21,7 @@ if(!defined('ABSPATH')) exit;
  */
 
 $mailpoet_plugin = array(
-  'version' => '3.0.0-rc.1.0.1',
+  'version' => '3.0.0-rc.1.0.2',
   'filename' => __FILE__,
   'path' => dirname(__FILE__),
   'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',
@@ -54,11 +54,8 @@ function mailpoet_php_version_notice() {
   printf('<div class="error"><p>%1$s</p></div>', $notice);
 }
 
-if(
+if(isset($_SERVER['SERVER_SOFTWARE']) && strpos(strtolower($_SERVER['SERVER_SOFTWARE']), 'microsoft-iis') !== false) {
-  isset($_SERVER["SERVER_SOFTWARE"])
+  add_action('admin_notices', 'mailpoet_microsoft_iis_notice');
-  && strpos(strtolower($_SERVER["SERVER_SOFTWARE"]), "microsoft-iis") !== false
-) {
-  add_action('admin_notices', 'mailpoet_php_version_notice');
   // deactivate the plugin
   add_action('admin_init', 'mailpoet_deactivate_plugin');
   return;
@@ -66,7 +63,7 @@ if(
 
 // Display IIS server error notice
 function mailpoet_microsoft_iis_notice() {
-  $notice = __('MailPoet plugin cannot run under Microsoft\'s Internet Information Services (IIS) web server. We recommend that you use a web server powered by Apache or NGINX.', 'mailpoet');
+  $notice = __("MailPoet plugin cannot run under Microsoft's Internet Information Services (IIS) web server. We recommend that you use a web server powered by Apache or NGINX.", 'mailpoet');
   printf('<div class="error"><p>%1$s</p></div>', $notice);
 }
 

readme.txt

@@ -3,7 +3,7 @@ Contributors: mailpoet, wysija
 Tags: newsletter, email, welcome email, post notification, autoresponder, signup, subscription, SMTP
 Requires at least: 4.6
 Tested up to: 4.8
-Stable tag: 3.0.0-rc.1.0.1
+Stable tag: 3.0.0-rc.1.0.2
 Create and send beautiful emails and newsletters from WordPress.
 
 == Description ==
@@ -93,6 +93,9 @@ Our [support site](https://beta.docs.mailpoet.com) has plenty of articles. You c
 
 == Changelog ==
 
+= 3.0.0-rc.1.0.2 - 2017-08-08 =
+* Fixed: correct error notice is displayed when using IIS server. Thanks @flauer!
+
 = 3.0.0-rc.1.0.1 - 2017-08-02 =
 * Fixed: we were so excited to come out of Beta, we forgot to include translation files. Woops :)
 

views/update.html

@@ -60,8 +60,8 @@
   <div class="feature-section one-col mailpoet_centered">
     <h2><%= __('Care to Give Your Opinion?') %></h2>
 
-    <script type="text/javascript" charset="utf-8" src="//static.polldaddy.com/p/9601216.js"></script>
+    <script type="text/javascript" charset="utf-8" src="https://secure.polldaddy.com/p/9792513.js"></script>
-    <noscript><a href="//polldaddy.com/poll/9601216/">You're using MailPoet version 3. But have you ever used version 2 before?</a></noscript>
+    <noscript><a href="//polldaddy.com/poll/9792513/">How many people on this website use MailPoet to send emails?</a></noscript>
   </div>
 
   <hr>