Popup Maker – Popup Forms, Optins & More - Version 1.3.3

Version Description

Download this release

Release Info

Developer danieliser
Plugin Icon 128x128 Popup Maker – Popup Forms, Optins & More
Version 1.3.3
Comparing to
See all releases

Code changes from version 1.3.2 to 1.3.3

Files changed (4) hide show
  1. includes/css-functions.php +46 -6
  2. includes/misc-functions.php +6 -0
  3. popup-maker.php +2 -2
  4. readme.txt +9 -1
includes/css-functions.php CHANGED
@@ -45,7 +45,13 @@ function popmake_get_font_style( $s, $w, $lh, $f, $st = null, $v = null ) {
45
 
46
  function popmake_generate_theme_styles( $popup_theme_id ) {
47
 
48
- $styles = array();
 
 
 
 
 
 
49
 
50
  $theme = popmake_get_popup_theme_data_attr( $popup_theme_id );
51
 
@@ -55,12 +61,16 @@ function popmake_generate_theme_styles( $popup_theme_id ) {
55
  return array();
56
  }
57
 
58
- $styles['overlay'] = array();
59
-
 
60
  if ( ! empty( $overlay['background_color'] ) ) {
61
  $styles['overlay']['background-color'] = popmake_get_rgba_value( $overlay['background_color'], $overlay['background_opacity'] );
62
  }
63
 
 
 
 
64
  $styles['container'] = array(
65
  'padding' => "{$container['padding']}px",
66
  'border-radius' => "{$container['border_radius']}px",
@@ -72,14 +82,23 @@ function popmake_generate_theme_styles( $popup_theme_id ) {
72
  $styles['container']['background-color'] = popmake_get_rgba_value( $container['background_color'], $container['background_opacity'] );
73
  }
74
 
75
-
 
 
76
  $styles['title'] = array(
77
  'color' => $title['font_color'],
78
  'text-align' => $title['text_align'],
79
  'text-shadow' => popmake_get_text_shadow_style( $title['textshadow_horizontal'], $title['textshadow_vertical'], $title['textshadow_blur'], $title['textshadow_color'], $title['textshadow_opacity'] ),
80
- 'font' => popmake_get_font_style( $title['font_size'], $title['font_weight'], $title['line_height'], $title['font_family'], $title['font_style'] )
 
 
 
 
81
  );
82
 
 
 
 
83
  $styles['content'] = array(
84
  'color' => $content['font_color'],
85
  'font-family' => $content['font_family'],
@@ -87,6 +106,9 @@ function popmake_generate_theme_styles( $popup_theme_id ) {
87
  'font-style' => $content['font_style'],
88
  );
89
 
 
 
 
90
  $styles['close'] = array(
91
  'height' => empty( $close['height'] ) || $close['height'] <= 0 ? 'auto' : "{$close['height']}px",
92
  'width' => empty( $close['width'] ) || $close['width'] <= 0 ? 'auto' : "{$close['width']}px",
@@ -96,7 +118,11 @@ function popmake_generate_theme_styles( $popup_theme_id ) {
96
  'top' => 'auto',
97
  'padding' => "{$close['padding']}px",
98
  'color' => $close['font_color'],
99
- 'font' => popmake_get_font_style( $close['font_size'], $close['font_weight'], $close['line_height'], $close['font_family'], $close['font_style'] ),
 
 
 
 
100
  'border' => popmake_get_border_style( $close['border_width'], $close['border_style'], $close['border_color'] ),
101
  'border-radius' => "{$close['border_radius']}px",
102
  'box-shadow' => popmake_get_box_shadow_style( $close['boxshadow_horizontal'], $close['boxshadow_vertical'], $close['boxshadow_blur'], $close['boxshadow_spread'], $close['boxshadow_color'], $close['boxshadow_opacity'], $close['boxshadow_inset'] ),
@@ -132,6 +158,11 @@ function popmake_generate_theme_styles( $popup_theme_id ) {
132
  function popmake_render_theme_styles( $popup_theme_id ) {
133
  $styles = '';
134
 
 
 
 
 
 
135
  $theme_styles = popmake_generate_theme_styles( $popup_theme_id );
136
 
137
  if ( empty( $theme_styles ) ) {
@@ -142,12 +173,21 @@ function popmake_render_theme_styles( $popup_theme_id ) {
142
  switch ( $element ) {
143
  case 'overlay':
144
  $rule = ".popmake-overlay.theme-{$popup_theme_id}";
 
 
 
145
  break;
146
  case 'container':
147
  $rule = ".popmake.theme-{$popup_theme_id}";
 
 
 
148
  break;
149
  default:
150
  $rule = ".popmake.theme-{$popup_theme_id} .popmake-{$element}";
 
 
 
151
  break;
152
  }
153
 
45
 
46
  function popmake_generate_theme_styles( $popup_theme_id ) {
47
 
48
+ $styles = array(
49
+ 'overlay' => array(),
50
+ 'container' => array(),
51
+ 'title' => array(),
52
+ 'content' => array(),
53
+ 'close' => array()
54
+ );
55
 
56
  $theme = popmake_get_popup_theme_data_attr( $popup_theme_id );
57
 
61
  return array();
62
  }
63
 
64
+ /*
65
+ * Overlay Styles
66
+ */
67
  if ( ! empty( $overlay['background_color'] ) ) {
68
  $styles['overlay']['background-color'] = popmake_get_rgba_value( $overlay['background_color'], $overlay['background_opacity'] );
69
  }
70
 
71
+ /*
72
+ * Container Styles
73
+ */
74
  $styles['container'] = array(
75
  'padding' => "{$container['padding']}px",
76
  'border-radius' => "{$container['border_radius']}px",
82
  $styles['container']['background-color'] = popmake_get_rgba_value( $container['background_color'], $container['background_opacity'] );
83
  }
84
 
85
+ /*
86
+ * Title Styles
87
+ */
88
  $styles['title'] = array(
89
  'color' => $title['font_color'],
90
  'text-align' => $title['text_align'],
91
  'text-shadow' => popmake_get_text_shadow_style( $title['textshadow_horizontal'], $title['textshadow_vertical'], $title['textshadow_blur'], $title['textshadow_color'], $title['textshadow_opacity'] ),
92
+ 'font-family' => $title['font_family'],
93
+ 'font-weight' => $title['font_weight'],
94
+ 'font-size' => $title['font_size'],
95
+ 'font-style' => $title['font_style'],
96
+ 'line-height' => $title['line_height'],
97
  );
98
 
99
+ /*
100
+ * Content Styles
101
+ */
102
  $styles['content'] = array(
103
  'color' => $content['font_color'],
104
  'font-family' => $content['font_family'],
106
  'font-style' => $content['font_style'],
107
  );
108
 
109
+ /*
110
+ * Close Styles
111
+ */
112
  $styles['close'] = array(
113
  'height' => empty( $close['height'] ) || $close['height'] <= 0 ? 'auto' : "{$close['height']}px",
114
  'width' => empty( $close['width'] ) || $close['width'] <= 0 ? 'auto' : "{$close['width']}px",
118
  'top' => 'auto',
119
  'padding' => "{$close['padding']}px",
120
  'color' => $close['font_color'],
121
+ 'font-family' => $close['font_family'],
122
+ 'font-weight' => $close['font_weight'],
123
+ 'font-size' => $close['font_size'],
124
+ 'font-style' => $close['font_style'],
125
+ 'line-height' => $close['line_height'],
126
  'border' => popmake_get_border_style( $close['border_width'], $close['border_style'], $close['border_color'] ),
127
  'border-radius' => "{$close['border_radius']}px",
128
  'box-shadow' => popmake_get_box_shadow_style( $close['boxshadow_horizontal'], $close['boxshadow_vertical'], $close['boxshadow_blur'], $close['boxshadow_spread'], $close['boxshadow_color'], $close['boxshadow_opacity'], $close['boxshadow_inset'] ),
158
  function popmake_render_theme_styles( $popup_theme_id ) {
159
  $styles = '';
160
 
161
+ $theme_data = get_post($popup_theme_id);
162
+ $slug = $theme_data->post_name != $popup_theme_id ? $theme_data->post_name : false;
163
+
164
+
165
+
166
  $theme_styles = popmake_generate_theme_styles( $popup_theme_id );
167
 
168
  if ( empty( $theme_styles ) ) {
173
  switch ( $element ) {
174
  case 'overlay':
175
  $rule = ".popmake-overlay.theme-{$popup_theme_id}";
176
+ if ( $slug ) {
177
+ $rule .= ", .popmake-overlay.theme-{$slug}";
178
+ }
179
  break;
180
  case 'container':
181
  $rule = ".popmake.theme-{$popup_theme_id}";
182
+ if ( $slug ) {
183
+ $rule .= ", .popmake.theme-{$slug}";
184
+ }
185
  break;
186
  default:
187
  $rule = ".popmake.theme-{$popup_theme_id} .popmake-{$element}";
188
+ if ( $slug ) {
189
+ $rule .= ", .popmake.theme-{$slug} .popmake-{$element}";
190
+ }
191
  break;
192
  }
193
 
includes/misc-functions.php CHANGED
@@ -5,6 +5,12 @@ if ( ! defined( 'ABSPATH' ) ) {
5
  exit;
6
  }
7
 
 
 
 
 
 
 
8
  if ( ! function_exists( 'get_called_class' ) ) {
9
  function get_called_class() {
10
  $bt = debug_backtrace();
5
  exit;
6
  }
7
 
8
+ if ( ! function_exists( 'current_action' ) ) {
9
+ function current_action() {
10
+ return current_filter();
11
+ }
12
+ }
13
+
14
  if ( ! function_exists( 'get_called_class' ) ) {
15
  function get_called_class() {
16
  $bt = debug_backtrace();
popup-maker.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin URI: https://wppopupmaker.com
5
  * Description: Easily create & style popups with any content. Theme editor to quickly style your popups. Add forms, social media boxes, videos & more.
6
  * Author: Daniel Iser
7
- * Version: 1.3.2
8
  * Author URI: https://wppopupmaker.com
9
  * Text Domain: popup-maker
10
  *
@@ -144,7 +144,7 @@ if ( ! class_exists( 'Popup_Maker' ) ) :
144
  }
145
 
146
  if ( ! defined( 'POPMAKE_VERSION' ) ) {
147
- define( 'POPMAKE_VERSION', '1.3.2' );
148
  }
149
 
150
  if ( ! defined( 'POPMAKE_DB_VERSION' ) ) {
4
  * Plugin URI: https://wppopupmaker.com
5
  * Description: Easily create & style popups with any content. Theme editor to quickly style your popups. Add forms, social media boxes, videos & more.
6
  * Author: Daniel Iser
7
+ * Version: 1.3.3
8
  * Author URI: https://wppopupmaker.com
9
  * Text Domain: popup-maker
10
  *
144
  }
145
 
146
  if ( ! defined( 'POPMAKE_VERSION' ) ) {
147
+ define( 'POPMAKE_VERSION', '1.3.3' );
148
  }
149
 
150
  if ( ! defined( 'POPMAKE_DB_VERSION' ) ) {
readme.txt CHANGED
@@ -6,7 +6,7 @@ Donate link:
6
  Tags: age restriction, age verification, auto open, automatic popup, conversion, conversions, custom popup, dialog box, exit intent, fancy box, fancy popup, form modal, full page popup, full screen pop, full screen popup, marketing, modal, modals, onclick popup, optin popup, pop-up, pop-ups, popup, popup ads, popup advertising, popup box, popup form, popup message, popup window, popups, unblockable, wordpress popup
7
  Requires at least: 3.4
8
  Tested up to: 4.2.4
9
- Stable tag: 1.3.2
10
  License: GNU Version 2 or Any Later Version
11
 
12
  The most versatile popup plugin for WordPress! Grow email subscriber lists, get more FB Likes, create login modals, content restriction & more.
@@ -41,6 +41,7 @@ With hooks, filters and a full JavaScript events API you can take basic popups t
41
 
42
  = 100% Supported Form Plugins =
43
  Not all form plugins are optimal for use in popups. The following support AJAX submission which is ideal for modal forms.
 
44
  * Gravity Forms
45
  * Ninja Forms
46
  * Contact Form 7
@@ -73,11 +74,14 @@ Need it in another language? Help us [translate Popup Maker](https://www.transif
73
  > + [Advanced Theme Builder](https://wppopupmaker.com/extensions/advanced-theme-builder?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Advanced+Theme+Builder "Advanced Theme Builder")
74
  > + [Secure Idle User Logout](https://wppopupmaker.com/extensions/secure-idle-user-logout?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Secure+Idle+User+Logout "Secure Idle User Logout")
75
  > + [Popup Analytics](https://wppopupmaker.com/extensions/popup-analytics?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Popup+Analytics "Popup Analytics")
 
76
  > For the full list of extensions and more information, visit [our extension store](https://wppopupmaker.com/extensions/?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Extensions+Page "Popup Maker Extensions")!
77
 
78
  [Subscribe to our Newsletter](https://wppopupmaker.com/newsletter-sign-up?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Newsletter+Signup "Popup Maker Newsletter Sign Up") and receive tutorials and guides tailored to teaching you how to drastically improve your conversion rates using Popup Maker.
 
79
  * If you like the plugin please rate & review it! If you love the plugin and want news & updates, follow us on [Twitter](https://twitter.com/wppopupmaker "Popup Maker on Twitter")!
80
  * Check out the [Popup Maker Website](https://wppopupmaker.com?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Home+Page "Popup Maker Website") for everything Popup Maker.
 
81
  [Plugin Developers Site](http://danieliser.com "Web Developer & WordPress Enthusiast") - Daniel Iser
82
 
83
  == Frequently Asked Questions ==
@@ -99,6 +103,10 @@ There are several common causes for this which include:
99
 
100
  == Changelog ==
101
 
 
 
 
 
102
  = v1.3.2 - 8/10/2015 =
103
  * Tweak: Pause HTML5 Videos when popup closes.
104
  * Fix: Prefixed several functions that collided with some themes.
6
  Tags: age restriction, age verification, auto open, automatic popup, conversion, conversions, custom popup, dialog box, exit intent, fancy box, fancy popup, form modal, full page popup, full screen pop, full screen popup, marketing, modal, modals, onclick popup, optin popup, pop-up, pop-ups, popup, popup ads, popup advertising, popup box, popup form, popup message, popup window, popups, unblockable, wordpress popup
7
  Requires at least: 3.4
8
  Tested up to: 4.2.4
9
+ Stable tag: 1.3.3
10
  License: GNU Version 2 or Any Later Version
11
 
12
  The most versatile popup plugin for WordPress! Grow email subscriber lists, get more FB Likes, create login modals, content restriction & more.
41
 
42
  = 100% Supported Form Plugins =
43
  Not all form plugins are optimal for use in popups. The following support AJAX submission which is ideal for modal forms.
44
+
45
  * Gravity Forms
46
  * Ninja Forms
47
  * Contact Form 7
74
  > + [Advanced Theme Builder](https://wppopupmaker.com/extensions/advanced-theme-builder?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Advanced+Theme+Builder "Advanced Theme Builder")
75
  > + [Secure Idle User Logout](https://wppopupmaker.com/extensions/secure-idle-user-logout?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Secure+Idle+User+Logout "Secure Idle User Logout")
76
  > + [Popup Analytics](https://wppopupmaker.com/extensions/popup-analytics?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Popup+Analytics "Popup Analytics")
77
+ >
78
  > For the full list of extensions and more information, visit [our extension store](https://wppopupmaker.com/extensions/?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Extensions+Page "Popup Maker Extensions")!
79
 
80
  [Subscribe to our Newsletter](https://wppopupmaker.com/newsletter-sign-up?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Newsletter+Signup "Popup Maker Newsletter Sign Up") and receive tutorials and guides tailored to teaching you how to drastically improve your conversion rates using Popup Maker.
81
+
82
  * If you like the plugin please rate & review it! If you love the plugin and want news & updates, follow us on [Twitter](https://twitter.com/wppopupmaker "Popup Maker on Twitter")!
83
  * Check out the [Popup Maker Website](https://wppopupmaker.com?utm_source=WordPress+Page&utm_medium=Text+Link&utm_campaign=Home+Page "Popup Maker Website") for everything Popup Maker.
84
+
85
  [Plugin Developers Site](http://danieliser.com "Web Developer & WordPress Enthusiast") - Daniel Iser
86
 
87
  == Frequently Asked Questions ==
103
 
104
  == Changelog ==
105
 
106
+ = v1.3.3 - 8/12/2015 =
107
+ * Fix: Added current_action fallback function for older versions of WP.
108
+ * Fix: Theme CSS rendering incorrect font settings.
109
+
110
  = v1.3.2 - 8/10/2015 =
111
  * Tweak: Pause HTML5 Videos when popup closes.
112
  * Fix: Prefixed several functions that collided with some themes.