Changeset 1461459

Timestamp:

07/27/2016 03:24:13 PM (10 years ago)

Author:

joshl

Message:

Bug fixes

Location:

sendpress/trunk

Files:

• classes/class-sendpress-data.php (modified) (2 diffs)
• classes/class-sendpress-template.php (modified) (4 diffs)
• classes/views/class-sendpress-view-emails-create.php (modified) (2 diffs)
• classes/views/class-sendpress-view-emails-edit.php (modified) (2 diffs)
• classes/views/class-sendpress-view-subscribers-subscriber.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• sendpress.php (modified) (2 diffs)

sendpress/trunk/classes/class-sendpress-data.php

@@ -451 +451 @@
         foreach($link as $key => $url ){
                 if($px !== 'text'){
-                    $output .= '<a href="'. $url .'" ><img src="'.  SENDPRESS_URL .'img/'. $px .'/'. $key .'.png" alt="'. $key .'" /></a> ';
+                    $output .= '<a href="'. $url .'" ><img class="sp-social" src="'.  SENDPRESS_URL .'img/'. $px .'/'. $key .'.png" alt="'. $key .'" /></a> ';
                 } else {
                     if($c > 1){
@@ -1055 +1055 @@
         $has_data = SendPress_Data::get_subscriber_meta( $subscriber_id, $meta_key, $list_id, true );
         if(empty($has_data)){
-            return SendPress_Data::add_subscriber_meta( $subscriber_id, $meta_key, $meta_value, $list_id, $app_only );
+            return SendPress_Data::add_subscriber_meta( $subscriber_id, $meta_key, $meta_value, $list_id );
         } else {
-            return $wpdb->update( $meta_table, array('meta_value'=>$meta_value), array('subscriberID'=>$subscriber_id,'meta_key' => $meta_key , 'meta_value' => $has_data[0]->meta_value, 'app_only' => $app_only ) );
+            return $wpdb->update( $meta_table, array('meta_value'=>$meta_value), array('subscriberID'=>$subscriber_id,'meta_key' => $meta_key , 'meta_value' => $has_data[0]->meta_value) );
         }
 

sendpress/trunk/classes/class-sendpress-template.php

@@ -552 +552 @@
             )
              */
+            $strings = array('sp-img','sp-social','sp-skip');
 
             foreach ($dom->getElementsByTagName('img') as $k => $img) {
                 $c = explode(' ',$img->getAttribute('class'));
                 $styled = $img->getAttribute('style');
-                if( is_array($c) ){
+                $replace_w = false;
+                $replace_h = false;
+
+                $width_r = $img->setAttribute('width','');
+                $w_r = strpos($width_r, '%');
+                if($w_r === false){
+                    $replace_w = true;
+                }
+
+                $height_r = $img->setAttribute('height','');
+                $h_r = strpos($height_r, '%');
+                if($h_r === false){
+                    $replace_h = true;
+                }
+
+
+
+                if( is_array($c) && ( count(array_intersect($c, $strings)) == 0 ) ){
                     $replace_image = false;
                     if( in_array('alignleft',$c) ){
@@ -564 +582 @@
                             $img->setAttribute('style','margin-right: 10px');
                             $img->setAttribute('class', 'sp-img ' . implode(' ', $c) );
-                            $img->setAttribute('width','');
-                                    $img->setAttribute('height','');
+                            if( $replace_w ){
+                                $img->setAttribute('width','');
+                            }
+                            if( $replace_h ){
+                                $img->setAttribute('height','');
+                            }
                         }
 
@@ -575 +597 @@
                             $img->setAttribute('style','margin-left: 10px');
                             $img->setAttribute('class', 'sp-img ' . implode(' ', $c) );
-                            $img->setAttribute('width','');
-                                    $img->setAttribute('height','');
+                            if( $replace_w ){
+                                $img->setAttribute('width','');
+                            }
+                            if( $replace_h ){
+                                $img->setAttribute('height','');
+                            }
                         }
                     }
                     //Center any image that has not been updated..
-                    if( in_array('aligncenter',$c) ||  ( $replace_image ==false && !in_array('sp-img',$c) ) ){
+                    if( in_array('aligncenter',$c) ||   $replace_image ==false ){
 
                             $table = $dom->createElement('table');
@@ -600 +626 @@
                             $img_r = $img->clonenode(true);
                             $img_r->setAttribute('align','center');
-                                $img_r->setAttribute('width','');
-                                    $img_r->setAttribute('height','');
+                            if( $replace_w ){
+                                $img_r->setAttribute('width','');
+                            }
+                            if( $replace_h ){
+                                $img_r->setAttribute('height','');
+                            }
 
                             $img_r->setAttribute('class', 'sp-img ' .implode(' ', $c) );

sendpress/trunk/classes/views/class-sendpress-view-emails-create.php

@@ -121 +121 @@
             'orderby' => 'title',
             'order' => 'ASC',
+            'posts_per_page' => -1,
             );
 
@@ -142 +143 @@
             'orderby' => 'title',
             'order' => 'ASC',
+            'posts_per_page' => -1,
             );
 

sendpress/trunk/classes/views/class-sendpress-view-emails-edit.php

@@ -219 +219 @@
             'post_type' => 'sp_template' ,
             'post_status' => array('sp-standard'),
+            'posts_per_page' => -1,
             );
 
@@ -243 +244 @@
             'post_type' => 'sp_template' ,
             'post_status' => array('sp-custom'),
+            'posts_per_page' => -1,
             );
 

sendpress/trunk/classes/views/class-sendpress-view-subscribers-subscriber.php

@@ -209 +209 @@
 </div>
 </form>
-<h3>Subscriber Actions and Events</h3>
+<!--<h3>Subscriber Actions and Events</h3>-->
     <div class="well">
         <?php
+        /*
         if(!defined("SENDPRESS_PRO_VERSION") ){
             _e('This feature requires SendPress Pro.','sendpress');
@@ -217 +218 @@
             do_action('sendpress_subscriber_events_view', SPNL()->validate->_int('subscriberID') );
         }
+        */
         ?>
     </div>
+    
 
     

sendpress/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.7
 Tested up to: 4.5.3
-Stable tag: 1.7.7.17
+Stable tag: 1.7.7.27
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -119 +119 @@
 Previous releases can be downloaded from [GitHub](https://github.com/brewlabs/sendpress/releases)
 
+= 1.7.7.27 - 2016.7.27 =
+* Fix: Post notification error
+* Fix: Social Icon alignment
+* Fix: Template list limited to 10
+
 = 1.7.7.17 - 2016.7.17 =
 * Fix: Error when sending

sendpress/trunk/sendpress.php

@@ -2 +2 @@
 /*
 Plugin Name: SendPress Newsletters
-Version: 1.7.7.17
+Version: 1.7.7.27
 Plugin URI: https://sendpress.com
 Description: Easy to manage Newsletters for WordPress.
@@ -19 +19 @@
 define( 'SENDPRESS_API_VERSION', 1 );
 define( 'SENDPRESS_MINIMUM_WP_VERSION', '3.6' );
-define( 'SENDPRESS_VERSION', '1.7.7.17' );
+define( 'SENDPRESS_VERSION', '1.7.7.27' );
 define( 'SENDPRESS_URL', plugin_dir_url( __FILE__ ) );
 define( 'SENDPRESS_PATH', plugin_dir_path( __FILE__ ) );