MailPoet Newsletters (Previous) - Version 2.7.14

Version Description

  • 2017-10-23 =
  • Removed SWFUpload support
  • Fixed path for TinyMCE styles
Download this release

Release Info

Developer wysija
Plugin Icon 128x128 MailPoet Newsletters (Previous)
Version 2.7.14
Comparing to
See all releases

Code changes from version 2.7.13 to 2.7.14

Files changed (10) hide show
  1. controllers/back.php +1 -7
  2. controllers/back/campaigns.php +0 -56
  3. core/base.php +1 -1
  4. css/admin-campaigns-medias.css +1 -1
  5. css/admin-campaigns-themes.css +1 -1
  6. helpers/back.php +1 -1
  7. index.php +1 -1
  8. languages/wysija-newsletters-ca.mo +0 -0
  9. readme.txt +5 -1
  10. views/back/campaigns.php +1 -165
controllers/back.php CHANGED
@@ -557,14 +557,8 @@ class WYSIJA_control_back extends WYSIJA_control{
557
  if(!isset($this->iframeTabs)) {
558
 
559
 
560
- //if wp version includes plupload then let's use it
561
- if(version_compare(get_bloginfo('version'), '3.3.0')>= 0){
562
- $this->iframeTabs=array(
563
  'special_new_wordp_upload'=>__('Upload',WYSIJA));
564
- }else{
565
- $this->iframeTabs=array(
566
- 'special_wordp_upload'=>__('Upload',WYSIJA));
567
- }
568
 
569
  $this->iframeTabs['special_wysija_browse']=__('Newsletter Images',WYSIJA);
570
  $this->iframeTabs['special_wordp_browse']=__('WordPress Posts\' Images',WYSIJA);
557
  if(!isset($this->iframeTabs)) {
558
 
559
 
560
+ $this->iframeTabs=array(
 
 
561
  'special_new_wordp_upload'=>__('Upload',WYSIJA));
 
 
 
 
562
 
563
  $this->iframeTabs['special_wysija_browse']=__('Newsletter Images',WYSIJA);
564
  $this->iframeTabs['special_wordp_browse']=__('WordPress Posts\' Images',WYSIJA);
controllers/back/campaigns.php CHANGED
@@ -2607,7 +2607,6 @@ class WYSIJA_control_back_campaigns extends WYSIJA_control_back {
2607
  }
2608
 
2609
  function special_new_wordp_upload() {
2610
-
2611
  wp_enqueue_script('wysija-plupload-handlers', WYSIJA_URL . 'js/jquery/pluploadHandler.js', array('plupload-all', 'jquery'));
2612
  $uploader_l10n = array(
2613
  'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
@@ -2646,61 +2645,6 @@ class WYSIJA_control_back_campaigns extends WYSIJA_control_back {
2646
  return wp_iframe(array($this->viewObj, 'popup_new_wp_upload'), $errors);
2647
  }
2648
 
2649
- function special_wordp_upload() {
2650
-
2651
- wp_enqueue_script('swfupload-all');
2652
- wp_enqueue_script('swfupload-handlers');
2653
- wp_enqueue_script('wysija-upload-handlers', WYSIJA_URL . "js/jquery/uploadHandlers.js");
2654
- wp_enqueue_script('image-edit');
2655
- wp_enqueue_script('set-post-thumbnail');
2656
- wp_enqueue_style('imgareaselect');
2657
-
2658
- $errors = array();
2659
- $id = 0;
2660
- if (isset($_GET['flash']))
2661
- $_GET['flash'] = 1;
2662
- if (isset($_POST['html-upload']) && !empty($_FILES)) {
2663
- // Upload File button was clicked
2664
- $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
2665
- unset($_FILES);
2666
- if (is_wp_error($id)) {
2667
- $errors['upload_error'] = $id;
2668
- $id = false;
2669
- }
2670
- }
2671
-
2672
- if (!empty($_POST['insertonlybutton'])) {
2673
- $href = $_POST['insertonly']['href'];
2674
- if (!empty($href) && !strpos($href, '://'))
2675
- $href = "http://$href";
2676
-
2677
- $title = esc_attr($_POST['insertonly']['title']);
2678
- if (empty($title))
2679
- $title = basename($href);
2680
- if (!empty($title) && !empty($href))
2681
- $html = "<a href='" . esc_url($href) . "' >$title</a>";
2682
- $html = apply_filters('file_send_to_editor_url', $html, esc_url_raw($href), $title);
2683
- return media_send_to_editor($html);
2684
- }
2685
-
2686
- if (!empty($_POST)) {
2687
- $return = media_upload_form_handler();
2688
-
2689
- if (is_string($return))
2690
- return $return;
2691
- if (is_array($return))
2692
- $errors = $return;
2693
- }
2694
-
2695
- if (isset($_POST['save'])) {
2696
- $errors['upload_notice'] = __('Saved.', WYSIJA);
2697
- return media_upload_gallery();
2698
- }
2699
-
2700
-
2701
- return wp_iframe(array($this->viewObj, 'popup_wp_upload'), $errors);
2702
- }
2703
-
2704
  function _checkEmailExists($emailId) {
2705
  $result = false;
2706
  $model_email = WYSIJA::get('email', 'model');
2607
  }
2608
 
2609
  function special_new_wordp_upload() {
 
2610
  wp_enqueue_script('wysija-plupload-handlers', WYSIJA_URL . 'js/jquery/pluploadHandler.js', array('plupload-all', 'jquery'));
2611
  $uploader_l10n = array(
2612
  'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
2645
  return wp_iframe(array($this->viewObj, 'popup_new_wp_upload'), $errors);
2646
  }
2647
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2648
  function _checkEmailExists($emailId) {
2649
  $result = false;
2650
  $model_email = WYSIJA::get('email', 'model');
core/base.php CHANGED
@@ -19,7 +19,7 @@ class WYSIJA_object{
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
- static $version = '2.7.13';
23
 
24
  function __construct(){}
25
 
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
+ static $version = '2.7.14';
23
 
24
  function __construct(){}
25
 
css/admin-campaigns-medias.css CHANGED
@@ -1 +1 @@
1
- .swfupload{vertical-align:middle}ul#sidemenu{bottom:-1px;float:none !important;font-weight:normal;left:0;margin:0 5px;overflow:hidden;float:none !important}.wysija-thumb{float:left;height:150px;margin:10px;width:150px;position:relative;border:2px dashed transparent;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;margin:8px}.wysija-thumb:hover,.wysija-thumb.selected:hover{border-color:#000;border-style:dashed}.wysija-thumb.selected{border-color:#4a5b04;border-style:solid;filter:alpha(opacity=100);-moz-opacity:1;opacity:1}.wysija-thumb img{cursor:pointer;max-height:150px;max-width:150px}.wysija-thumb span.delete{background:url("../img/controls/icons.png") no-repeat scroll -100px 0 transparent;cursor:pointer;height:20px;text-indent:-9999px;display:block;width:20px}.wysija-thumb span.delete-wrap{background-color:#DFDFDF;background-image:-moz-linear-gradient(center bottom, #bbb, #eee);border:1px solid #CCCCCC;border-radius:2px 2px 2px 2px;box-shadow:0 1px 0 rgba(0,0,0,0.15),0 0 2px 1px #fff inset;height:20px;position:absolute;right:2px;top:2px;margin:5px 3px 0 0;width:20px;display:none}.wysija-thumb span.thumb_url,.wysija-thumb span.url,.wysija-thumb span.width,.wysija-thumb span.height,.wysija-thumb span.identifier{display:none}.wysija-thumb:hover span.delete-wrap{display:block}.wysija-thumb span.delete:hover{background-position:-100px -20px}.clear{clear:both}.tablenav{margin-right:20px}#media-items{overflow:auto}.media-wp-upload #media-items{display:none}.media-browse #media-items{width:100%;height:340px;margin:0 0 10px 0}.media-wp-browse #media-items{width:100%;height:340px;margin:0 0 10px 0}#media-items em{margin:0 0 0 20px}#media-items,.ml-submit{float:left}.ml-submit{margin-top:15px;margin-left:15px}#loader{left:50%;position:relative;top:50%}#overlay{background-color:#FFFFFF;height:100%;opacity:0.8;position:absolute;width:100%;z-index:999;display:none}#flash-upload-ui{padding:10px 25px}.after-file-upload{padding:0 25px}.after-file-upload,.upload-flash-bypass,.howto{display:none}.wysija-thumb .slidetoggle,.wysija-thumb .toggle{display:none}.max-upload-size{margin:10px 0;display:block}
1
+ ul#sidemenu{bottom:-1px;float:none !important;font-weight:normal;left:0;margin:0 5px;overflow:hidden;float:none !important}.wysija-thumb{float:left;height:150px;margin:10px;width:150px;position:relative;border:2px dashed transparent;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;margin:8px}.wysija-thumb:hover,.wysija-thumb.selected:hover{border-color:#000;border-style:dashed}.wysija-thumb.selected{border-color:#4a5b04;border-style:solid;filter:alpha(opacity=100);-moz-opacity:1;opacity:1}.wysija-thumb img{cursor:pointer;max-height:150px;max-width:150px}.wysija-thumb span.delete{background:url("../img/controls/icons.png") no-repeat scroll -100px 0 transparent;cursor:pointer;height:20px;text-indent:-9999px;display:block;width:20px}.wysija-thumb span.delete-wrap{background-color:#DFDFDF;background-image:-moz-linear-gradient(center bottom, #bbb, #eee);border:1px solid #CCCCCC;border-radius:2px 2px 2px 2px;box-shadow:0 1px 0 rgba(0,0,0,0.15),0 0 2px 1px #fff inset;height:20px;position:absolute;right:2px;top:2px;margin:5px 3px 0 0;width:20px;display:none}.wysija-thumb span.thumb_url,.wysija-thumb span.url,.wysija-thumb span.width,.wysija-thumb span.height,.wysija-thumb span.identifier{display:none}.wysija-thumb:hover span.delete-wrap{display:block}.wysija-thumb span.delete:hover{background-position:-100px -20px}.clear{clear:both}.tablenav{margin-right:20px}#media-items{overflow:auto}.media-wp-upload #media-items{display:none}.media-browse #media-items{width:100%;height:340px;margin:0 0 10px 0}.media-wp-browse #media-items{width:100%;height:340px;margin:0 0 10px 0}#media-items em{margin:0 0 0 20px}#media-items,.ml-submit{float:left}.ml-submit{margin-top:15px;margin-left:15px}#loader{left:50%;position:relative;top:50%}#overlay{background-color:#FFFFFF;height:100%;opacity:0.8;position:absolute;width:100%;z-index:999;display:none}#flash-upload-ui{padding:10px 25px}.after-file-upload{padding:0 25px}.after-file-upload,.upload-flash-bypass,.howto{display:none}.wysija-thumb .slidetoggle,.wysija-thumb .toggle{display:none}.max-upload-size{margin:10px 0;display:block}
css/admin-campaigns-themes.css CHANGED
@@ -1 +1 @@
1
- .swfupload{vertical-align:middle}ul#sidemenu{bottom:-1px;float:none !important;font-weight:normal;left:0;margin:0 5px;overflow:hidden}#loader{left:50%;position:relative;top:50%}.loading{margin:15px 0 0 0}#overlay{background-color:#fff;opacity:0.8;width:100%;height:100%;position:fixed;top:0;bottom:0;left:0;right:0;z-index:999;display:none}#flash-upload-ui{padding:10px 25px}.after-file-upload{padding:0 25px}#close-pop-alt{float:right;margin-right:50px;margin-top:10px}.after-file-upload,.upload-flash-bypass,.howto{display:none}#theme-view .preview,#theme-view .infos{float:left}#theme-view .infos{width:300px;margin:0 0 0 20px}#theme-view .preview{background:url(../img/wpspin_light.gif) no-repeat scroll center center transparent}#theme-view .preview img{width:320px;display:block}#theme-view{font-size:14px;height:480px;overflow:auto}#theme-view h2{color:#555555;font-family:Tahoma;font-size:24px;margin:4px 0 0;line-height:1.2em}#theme-view .actions{margin-bottom:10px}div.star{background-color:transparent;border:medium none;height:100%;left:0;letter-spacing:1ex;position:absolute;top:0}.stars{background:url(../img/stars.png) repeat-x scroll left bottom transparent;height:17px;position:relative;width:95px}.stars .star-rating{background:url(../img/stars.png) repeat-x scroll left top transparent;float:left;height:17px;overflow:hidden;text-indent:100%;white-space:nowrap}.my-rating a{height:17px;width:19px;float:left;margin:0;padding:0}.my-rating a.active,.my-rating a:hover,.my-rating a.on{background:url(../img/stars.png) no-repeat left top transparent}.my-rating a.active.off,.my-rating a.off{background:none}div.paragraph{margin:10px 0}.star-holder.my-rate img{cursor:pointer}.star-holder.my-rate div.star:hover{background-color:#DD0000}div.star.select.star-rating{background-color:#FFCC00}#theme-upload{display:none}.avatar{border:2px solid #CCC;float:right;margin:0}#overwrite{margin:0px 10px 0 0}#filter-selection{position:relative;top:3px}.theme-screenshot{padding:0;width:320px;border:1px solid #ccc;position:relative;background-color:#fff;-webkit-box-shadow:0 0 4px rgba(0,0,0,0.2),inset 0 0 20px rgba(0,0,0,0.1);-moz-box-shadow:0 0 4px rgba(0,0,0,0.2),inset 0 0 20px rgba(0,0,0,0.1);box-shadow:0 0 5px rgba(0,0,0,0.2),inset 0 0 20px rgba(0,0,0,0.1)}.theme-screenshot:before,.theme-screenshot:after{position:absolute;width:40%;height:10px;content:' ';left:12px;bottom:12px;background:transparent;-webkit-transform:skew(-5deg) rotate(-5deg);-moz-transform:skew(-5deg) rotate(-5deg);-ms-transform:skew(-5deg) rotate(-5deg);-o-transform:skew(-5deg) rotate(-5deg);transform:skew(-5deg) rotate(-5deg);-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.3);-moz-box-shadow:0 6px 12px rgba(0,0,0,0.3);box-shadow:0 6px 12px rgba(0,0,0,0.3);z-index:-1}.theme-screenshot:after{left:auto;right:12px;-webkit-transform:skew(5deg) rotate(5deg);-moz-transform:skew(5deg) rotate(5deg);-ms-transform:skew(5deg) rotate(5deg);-o-transform:skew(5deg) rotate(5deg);transform:skew(5deg) rotate(5deg)}.theme-screenshot img{width:320px}#wj_paginator{float:right;margin-right:10px;font-size:14px}#wj_paginator a{margin:0 1px}#wj_paginator span{font-weight:bold;margin:0 1px}#wj_paginator a.selected{color:#000;text-decoration:none;cursor:default}#themes-list{height:405px;margin:0}.theme{float:left;margin:0px;overflow:hidden;width:152px;margin:25px 8px 0 0}.theme.last{margin-right:0}.theme .thumbnail{height:170px;width:150px;position:relative;border:1px solid #999999;background-color:#000000}.theme img{width:150px;height:170px;position:absolute;z-index:1;top:0px;left:0px}.theme .install{display:none;float:none !important}.theme:hover img{filter:alpha(opacity=25);-moz-opacity:0.25;opacity:0.25}.theme:hover .thumbnail{border:1px solid #2a749f}.theme:hover .install{display:block;position:relative;z-index:100;text-align:center;margin:0px auto;margin-top:80px;width:80px !important}.theme .infos{display:block;width:100%;margin:5px 0 0 0;padding:0;text-align:left;font-size:12px;line-height:1em;color:#999999;text-decoration:none}.theme .infos:hover{color:#21759b;text-decoration:underline}
1
+ ul#sidemenu{bottom:-1px;float:none !important;font-weight:normal;left:0;margin:0 5px;overflow:hidden}#loader{left:50%;position:relative;top:50%}.loading{margin:15px 0 0 0}#overlay{background-color:#fff;opacity:0.8;width:100%;height:100%;position:fixed;top:0;bottom:0;left:0;right:0;z-index:999;display:none}#flash-upload-ui{padding:10px 25px}.after-file-upload{padding:0 25px}#close-pop-alt{float:right;margin-right:50px;margin-top:10px}.after-file-upload,.upload-flash-bypass,.howto{display:none}#theme-view .preview,#theme-view .infos{float:left}#theme-view .infos{width:300px;margin:0 0 0 20px}#theme-view .preview{background:url(../img/wpspin_light.gif) no-repeat scroll center center transparent}#theme-view .preview img{width:320px;display:block}#theme-view{font-size:14px;height:480px;overflow:auto}#theme-view h2{color:#555555;font-family:Tahoma;font-size:24px;margin:4px 0 0;line-height:1.2em}#theme-view .actions{margin-bottom:10px}div.star{background-color:transparent;border:medium none;height:100%;left:0;letter-spacing:1ex;position:absolute;top:0}.stars{background:url(../img/stars.png) repeat-x scroll left bottom transparent;height:17px;position:relative;width:95px}.stars .star-rating{background:url(../img/stars.png) repeat-x scroll left top transparent;float:left;height:17px;overflow:hidden;text-indent:100%;white-space:nowrap}.my-rating a{height:17px;width:19px;float:left;margin:0;padding:0}.my-rating a.active,.my-rating a:hover,.my-rating a.on{background:url(../img/stars.png) no-repeat left top transparent}.my-rating a.active.off,.my-rating a.off{background:none}div.paragraph{margin:10px 0}.star-holder.my-rate img{cursor:pointer}.star-holder.my-rate div.star:hover{background-color:#DD0000}div.star.select.star-rating{background-color:#FFCC00}#theme-upload{display:none}.avatar{border:2px solid #CCC;float:right;margin:0}#overwrite{margin:0px 10px 0 0}#filter-selection{position:relative;top:3px}.theme-screenshot{padding:0;width:320px;border:1px solid #ccc;position:relative;background-color:#fff;-webkit-box-shadow:0 0 4px rgba(0,0,0,0.2),inset 0 0 20px rgba(0,0,0,0.1);-moz-box-shadow:0 0 4px rgba(0,0,0,0.2),inset 0 0 20px rgba(0,0,0,0.1);box-shadow:0 0 5px rgba(0,0,0,0.2),inset 0 0 20px rgba(0,0,0,0.1)}.theme-screenshot:before,.theme-screenshot:after{position:absolute;width:40%;height:10px;content:' ';left:12px;bottom:12px;background:transparent;-webkit-transform:skew(-5deg) rotate(-5deg);-moz-transform:skew(-5deg) rotate(-5deg);-ms-transform:skew(-5deg) rotate(-5deg);-o-transform:skew(-5deg) rotate(-5deg);transform:skew(-5deg) rotate(-5deg);-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.3);-moz-box-shadow:0 6px 12px rgba(0,0,0,0.3);box-shadow:0 6px 12px rgba(0,0,0,0.3);z-index:-1}.theme-screenshot:after{left:auto;right:12px;-webkit-transform:skew(5deg) rotate(5deg);-moz-transform:skew(5deg) rotate(5deg);-ms-transform:skew(5deg) rotate(5deg);-o-transform:skew(5deg) rotate(5deg);transform:skew(5deg) rotate(5deg)}.theme-screenshot img{width:320px}#wj_paginator{float:right;margin-right:10px;font-size:14px}#wj_paginator a{margin:0 1px}#wj_paginator span{font-weight:bold;margin:0 1px}#wj_paginator a.selected{color:#000;text-decoration:none;cursor:default}#themes-list{height:405px;margin:0}.theme{float:left;margin:0px;overflow:hidden;width:152px;margin:25px 8px 0 0}.theme.last{margin-right:0}.theme .thumbnail{height:170px;width:150px;position:relative;border:1px solid #999999;background-color:#000000}.theme img{width:150px;height:170px;position:absolute;z-index:1;top:0px;left:0px}.theme .install{display:none;float:none !important}.theme:hover img{filter:alpha(opacity=25);-moz-opacity:0.25;opacity:0.25}.theme:hover .thumbnail{border:1px solid #2a749f}.theme:hover .install{display:block;position:relative;z-index:100;text-align:center;margin:0px auto;margin-top:80px;width:80px !important}.theme .infos{display:block;width:100%;margin:5px 0 0 0;padding:0;text-align:left;font-size:12px;line-height:1em;color:#999999;text-decoration:none}.theme .infos:hover{color:#21759b;text-decoration:underline}
helpers/back.php CHANGED
@@ -555,7 +555,7 @@ class WYSIJA_help_back extends WYSIJA_help{
555
  if(get_user_option('rich_editing') == 'true') {
556
  add_filter("mce_external_plugins", array($this,"addRichPlugin"));
557
  add_filter('mce_buttons', array($this,'addRichButton1'),999);
558
- $myStyleUrl = "../../plugins/wysija-newsletters/css/tmce/style.css";
559
  add_editor_style($myStyleUrl);
560
  //add_filter('tiny_mce_before_init', array($this,'TMCEinnercss'),12 );
561
  wp_enqueue_style('custom_TMCE_admin_css', WYSIJA_URL.'css/tmce/panelbtns.css');
555
  if(get_user_option('rich_editing') == 'true') {
556
  add_filter("mce_external_plugins", array($this,"addRichPlugin"));
557
  add_filter('mce_buttons', array($this,'addRichButton1'),999);
558
+ $myStyleUrl = WYSIJA_URL."css/tmce/style.css";
559
  add_editor_style($myStyleUrl);
560
  //add_filter('tiny_mce_before_init', array($this,'TMCEinnercss'),12 );
561
  wp_enqueue_style('custom_TMCE_admin_css', WYSIJA_URL.'css/tmce/panelbtns.css');
index.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: MailPoet 2
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters or automated emails. Capture subscribers with a widget. Import and manage your lists. This version is being replaced by MailPoet 3. Support offered to Premium customers only. Updates are limited to security issues.
6
- Version: 2.7.13
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
3
  Plugin Name: MailPoet 2
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters or automated emails. Capture subscribers with a widget. Import and manage your lists. This version is being replaced by MailPoet 3. Support offered to Premium customers only. Updates are limited to security issues.
6
+ Version: 2.7.14
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
languages/wysija-newsletters-ca.mo CHANGED
Binary file
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: wysija
3
  Tags: newsletter, email, welcome email, post notification, autoresponder, signup, subscription, SMTP
4
  Requires at least: 3.5
5
  Tested up to: 4.8
6
- Stable tag: 2.7.13
7
  Send newsletters post notifications or autoresponders from WordPress easily, and beautifully. Start to capture subscribers with our widget now.
8
 
9
  == Description ==
@@ -113,6 +113,10 @@ Our [support site](https://www.mailpoet.com/support) has plenty of articles and
113
 
114
  == Changelog ==
115
 
 
 
 
 
116
  = 2.7.13 - 2017-09-29 =
117
  * Added throttling of repeated subscriptions from an IP address
118
 
3
  Tags: newsletter, email, welcome email, post notification, autoresponder, signup, subscription, SMTP
4
  Requires at least: 3.5
5
  Tested up to: 4.8
6
+ Stable tag: 2.7.14
7
  Send newsletters post notifications or autoresponders from WordPress easily, and beautifully. Start to capture subscribers with our widget now.
8
 
9
  == Description ==
113
 
114
  == Changelog ==
115
 
116
+ = 2.7.14 - 2017-10-23 =
117
+ * Removed SWFUpload support
118
+ * Fixed path for TinyMCE styles
119
+
120
  = 2.7.13 - 2017-09-29 =
121
  * Added throttling of repeated subscriptions from an IP address
122
 
views/back/campaigns.php CHANGED
@@ -1215,11 +1215,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
1215
  <div class="wj_images" style="display:none;">
1216
  <div class="wj_button">
1217
  <?php
1218
- if (version_compare(get_bloginfo('version'), '3.3.0') >= 0) {
1219
- $action = 'special_new_wordp_upload';
1220
- } else {
1221
- $action = 'special_wordp_upload';
1222
- }
1223
  ?>
1224
  <a id="wysija-upload-browse" class="button" href="javascript:;" href2="admin.php?page=wysija_campaigns&action=medias&tab=<?php echo $action; ?>&emailId=<?php echo $_REQUEST['id'] ?>"><?php _e('Add Images', WYSIJA) ?></a>
1225
  </div>
@@ -2560,166 +2556,6 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2560
  <?php
2561
  }
2562
 
2563
- function popup_wp_upload($errors) {
2564
- global $redir_tab, $type, $tab;
2565
-
2566
- $redir_tab = 'wp_upload';
2567
-
2568
- media_upload_header();
2569
- $flash_action_url = admin_url('async-upload.php');
2570
-
2571
- // If Mac and mod_security, no Flash. :(
2572
- $flash = true;
2573
- /*
2574
- if(false !== stripos($_SERVER['HTTP_USER_AGENT'], 'mac') && apache_mod_loaded('mod_security')) {
2575
- $flash = false;
2576
- } */
2577
-
2578
- $flash = apply_filters('flash_uploader', $flash);
2579
- $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
2580
-
2581
- $upload_size_unit = $max_upload_size = wp_max_upload_size();
2582
- $sizes = array('KB', 'MB', 'GB');
2583
- for ($u = -1; $upload_size_unit > 1024 && $u < count($sizes) - 1; $u++)
2584
- $upload_size_unit /= 1024;
2585
- if ($u < 0) {
2586
- $upload_size_unit = 0;
2587
- $u = 0;
2588
- } else {
2589
- $upload_size_unit = (int) $upload_size_unit;
2590
- }
2591
- echo $this->messages(true);
2592
- ?>
2593
- <div class="updated"><ul><li><?php _e('Please update your WordPress to the latest version, in order to get the latest uploading system.', WYSIJA) ?></li></ul></div>
2594
- <div id="overlay"><img id="loader" src="<?php echo WYSIJA_URL ?>img/wpspin_light.gif" /></div>
2595
- <div class="popup_content media-wp-upload">
2596
- <script type="text/javascript">
2597
- //<![CDATA[
2598
- var uploaderMode = 0;
2599
- jQuery(document).ready(function($) {
2600
- uploaderMode = getUserSetting('uploader');
2601
- $('.upload-html-bypass a').click(function() {
2602
- deleteUserSetting('uploader');
2603
- uploaderMode = 0;
2604
- swfuploadPreLoad();
2605
- return false;
2606
- });
2607
- $('.upload-flash-bypass a').click(function() {
2608
- setUserSetting('uploader', '1');
2609
- uploaderMode = 1;
2610
- swfuploadPreLoad();
2611
- return false;
2612
- });
2613
- });
2614
- //]]>
2615
- </script>
2616
-
2617
- <div id="media-upload-notice">
2618
- <?php if (isset($errors['upload_notice'])) { ?>
2619
- <?php echo $errors['upload_notice']; ?>
2620
- <?php } ?>
2621
- </div>
2622
- <div id="media-upload-error">
2623
- <?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?>
2624
- <?php echo $errors['upload_error']->get_error_message(); ?>
2625
- <?php } ?>
2626
- </div>
2627
- <?php
2628
- // Check quota for this blog if multisite
2629
- if (is_multisite() && !is_upload_space_available()) {
2630
- echo '<p>' . sprintf(__('Sorry, you have filled your storage quota (%s MB).'), get_space_allowed()) . '</p>';
2631
- return;
2632
- }
2633
-
2634
- do_action('pre-upload-ui');
2635
-
2636
- if ($flash) :
2637
- ?>
2638
- <script type="text/javascript">
2639
- //<![CDATA[
2640
- var swfu;
2641
- SWFUpload.onload = function() {
2642
- var settings = {
2643
- button_text: '<span class="button"><?php _e('Select Files', WYSIJA); ?><\/span>',
2644
- button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif; font-size: 11px; text-shadow: 0 1px 0 #FFFFFF; color:#464646; }',
2645
- button_height: "23",
2646
- button_width: "132",
2647
- button_text_top_padding: 3,
2648
- button_image_url: '<?php echo includes_url('images/upload.png?ver=20100531'); ?>',
2649
- button_placeholder_id: "flash-browse-button",
2650
- upload_url: "<?php echo esc_attr($flash_action_url); ?>",
2651
- flash_url: "<?php echo includes_url() . 'js/swfupload/swfupload.swf'; ?>",
2652
- file_post_name: "async-upload",
2653
- file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
2654
- post_params: {
2655
- "post_id": "<?php echo $post_id; ?>",
2656
- "auth_cookie": "<?php echo (is_ssl() ? $_COOKIE[SECURE_AUTH_COOKIE] : $_COOKIE[AUTH_COOKIE]); ?>",
2657
- "logged_in_cookie": "<?php echo $_COOKIE[LOGGED_IN_COOKIE]; ?>",
2658
- "_wpnonce": "<?php echo wp_create_nonce('media-form'); ?>",
2659
- "type": "<?php echo $type; ?>",
2660
- "tab": "<?php echo $tab; ?>",
2661
- "short": "1"
2662
- },
2663
- file_size_limit: "<?php echo $max_upload_size; ?>b",
2664
- file_dialog_start_handler: fileDialogStart,
2665
- file_queued_handler: fileQueued,
2666
- upload_start_handler: uploadStart,
2667
- upload_progress_handler: uploadProgress,
2668
- upload_error_handler: uploadError,
2669
- upload_success_handler: WYSIJAuploadSuccess,
2670
- upload_complete_handler: WYSIJAuploadComplete,
2671
- file_queue_error_handler: fileQueueError,
2672
- file_dialog_complete_handler: fileDialogComplete,
2673
- swfupload_pre_load_handler: swfuploadPreLoad,
2674
- swfupload_load_failed_handler: swfuploadLoadFailed,
2675
- custom_settings: {
2676
- degraded_element_id: "html-upload-ui", // id of the element displayed when swfupload is unavailable
2677
- swfupload_element_id: "flash-upload-ui" // id of the element displayed when swfupload is available
2678
- },
2679
- debug: false
2680
- };
2681
- swfu = new SWFUpload(settings);
2682
- };
2683
- //]]>
2684
- </script>
2685
-
2686
- <div id="flash-upload-ui" class="hide-if-no-js">
2687
- <?php do_action('pre-flash-upload-ui'); ?>
2688
-
2689
- <div>
2690
- <?php _e('Choose files to upload', WYSIJA); ?>
2691
- <div id="flash-browse-button"></div>
2692
- <span><input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload', WYSIJA); ?>" class="button" /></span>
2693
- </div>
2694
- <p class="media-upload-size"><?php printf(__('Maximum upload file size: %d%s', WYSIJA), $upload_size_unit, $sizes[$u]); ?></p>
2695
- <?php do_action('post-flash-upload-ui'); ?>
2696
- </div>
2697
- <?php endif; // $flash ?>
2698
-
2699
- <div id="html-upload-ui">
2700
- <?php do_action('pre-html-upload-ui'); ?>
2701
- <p id="async-upload-wrap">
2702
- <label class="screen-reader-text" for="async-upload"><?php _e('Upload', WYSIJA); ?></label>
2703
- <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php esc_attr_e('Upload', WYSIJA); ?>" /> <a href="#" onclick="try {
2704
- top.tb_remove();
2705
- } catch (e) {
2706
- }
2707
- ;
2708
- return false;"><?php _e('Cancel', WYSIJA); ?></a>
2709
- </p>
2710
- <div class="clear"></div>
2711
- <p class="media-upload-size"><?php printf(__('Maximum upload file size: %d%s', WYSIJA), $upload_size_unit, $sizes[$u]); ?></p>
2712
- <?php if (is_lighttpd_before_150()): ?>
2713
- <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p>
2714
- <?php endif; ?>
2715
- <?php do_action('post-html-upload-ui', $flash); ?>
2716
- </div>
2717
- <?php do_action('post-upload-ui'); ?>
2718
- <div id="media-items" class="clearfix"></div>
2719
- </div>
2720
- <?php
2721
- }
2722
-
2723
  function _get_media_items($post_id, $errors, $wpimage = false) {
2724
  $attachments = array();
2725
 
1215
  <div class="wj_images" style="display:none;">
1216
  <div class="wj_button">
1217
  <?php
1218
+ $action = 'special_new_wordp_upload';
 
 
 
 
1219
  ?>
1220
  <a id="wysija-upload-browse" class="button" href="javascript:;" href2="admin.php?page=wysija_campaigns&action=medias&tab=<?php echo $action; ?>&emailId=<?php echo $_REQUEST['id'] ?>"><?php _e('Add Images', WYSIJA) ?></a>
1221
  </div>
2556
  <?php
2557
  }
2558
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2559
  function _get_media_items($post_id, $errors, $wpimage = false) {
2560
  $attachments = array();
2561