WordPress.org

Plugin Directory

Changeset 1375602


Ignore:
Timestamp:
03/21/16 12:06:02 (20 months ago)
Author:
tepelstreel
Message:

RSS Image Feed version 4.2.4

Location:
rss-image-feed
Files:
20 edited
1 copied

Legend:

Unmodified
Added
Removed
  • rss-image-feed/tags/4.2.4/class-lib/A5_ExcerptClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets the excerpt of a post according to some parameters 
  • rss-image-feed/tags/4.2.4/class-lib/A5_FormFieldClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets all sort of input fields for plugins by Atelier 5  
     
    1616class A5_FormField { 
    1717     
    18     const version = '1.0 beta 20160127 RIF'; 
     18    const version = '1.0 beta 20160321 RIF'; 
    1919     
    2020    public $formfield; 
  • rss-image-feed/tags/4.2.4/class-lib/A5_ImageClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets the alt and title tag for attachments 
     
    4242        endif; 
    4343         
    44         if (!isset($attachment)) return false; 
    45          
    4644        $title = get_the_title($id); 
    4745         
    4846        $title_tag = __('Permalink to', 'rss-image-feed').' '.esc_attr($title); 
    49                    
    50         $image_alt = trim(strip_tags( get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true) )); 
    51          
    52         $image_title = trim(strip_tags( $attachment->post_title )); 
     47         
     48        $image_alt = (isset($attachment)) ? trim(strip_tags(get_post_meta($attachment->ID, '_wp_attachment_image_alt', true))) : '';     
     49        $image_title = (isset($attachment)) ? trim(strip_tags($attachment->post_title)) : ''; 
    5350     
    5451        $image_alt = (empty($image_alt)) ? esc_attr($title) : esc_attr($image_alt); 
     
    8885        if (!isset($image_size)) $image_size = array($width, $height); 
    8986         
     87        if (is_string($image_size)) : 
     88         
     89            global $_wp_additional_image_sizes; 
     90             
     91            $width = ('full' == $image_size) ? 9999 : $_wp_additional_image_sizes[$image_size]['width']; 
     92         
     93        endif; 
     94         
    9095        if (!isset($number)) : 
    9196         
     
    402407        if (!$thumb) return false; 
    403408         
    404         if ($thumb[3] == false) : 
    405          
    406             if (!is_array($size)) : 
    407              
    408                 $image_size = self::get_image_size($size); 
    409                  
    410                 if (false == $image_size) return $thumb; 
    411                  
    412                 $size = array($image_size['width'], (true == $image_size['crop']) ? $image_size['height'] : '9999'); 
    413              
    414             endif; 
    415          
    416             $src = explode(',', wp_get_attachment_image_srcset($attachment_id, $size)); 
    417              
    418             foreach ($src as $img) : 
    419              
    420                 $img_src = explode(' ', trim($img)); 
    421                  
    422                 $width = str_replace('w', '', $img_src[1]); 
    423                  
    424                 if ($size[0] <= $width) : 
    425                  
    426                     $image[$width] = $img_src[0]; 
    427                      
     409        if (function_exists('wp_get_attachment_image_srcset')) : 
     410         
     411            if ($thumb[3] == false) : 
     412             
     413                if (!is_array($size)) : 
     414                 
     415                    $image_size = self::get_image_size($size); 
     416                     
     417                    if (false == $image_size) return $thumb; 
     418                     
     419                    $size = array($image_size['width'], (true == $image_size['crop']) ? $image_size['height'] : '9999'); 
     420                 
    428421                endif; 
    429422             
    430             endforeach; 
    431              
    432             if (isset($image)) : 
    433              
    434                 ksort($image); 
    435              
    436                 $thumb[0] = current($image); 
    437                  
    438             endif; 
    439          
     423                $src = explode(',', wp_get_attachment_image_srcset($attachment_id, $size)); 
     424                 
     425                foreach ($src as $img) : 
     426                 
     427                    $img_src = explode(' ', trim($img)); 
     428                     
     429                    $width = str_replace('w', '', $img_src[1]); 
     430                     
     431                    if ($size[0] <= $width) : 
     432                     
     433                        $image[$width] = $img_src[0]; 
     434                         
     435                    endif; 
     436                 
     437                endforeach; 
     438                 
     439                if (isset($image)) : 
     440                 
     441                    ksort($image); 
     442                 
     443                    $thumb[0] = current($image); 
     444                     
     445                endif; 
     446             
     447            endif; 
     448             
    440449        endif; 
    441450         
  • rss-image-feed/tags/4.2.4/class-lib/A5_OptionPageClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets all sort of containers for the flexible A5 settings pages 
     
    142142         
    143143        $class = (false === $closed) ? '' : ' closed'; 
    144      
    145         $output = $eol.'<div id="'.$id.'" class="postbox'.$class.'">'.$eol.$tab.'<div class="handlediv" title="'.__('Click to toggle').'">'.$eol.$dtab.'<br />'.$eol.$tab.'</div>'.$eol.$tab; 
    146              
    147         $output .= $eol.'<h3 class="hndle">'.$eol.$dtab.'<span>'.$label.'</span>'.$eol.$tab.'</h3>'.$eol.$tab.'<div class="inside">'.$eol.$tab;  
     144        $area = (false === $closed) ? 'true' : 'false'; 
     145     
     146        $output = $eol.'<div id="'.$id.'" class="postbox'.$class.'">'.$eol.$tab.'<div class="handlediv" title="'.__('Click to toggle').'" area-expanded="'.$area.'">'.$eol.$dtab.'<br />'.$eol.$tab.'</div>'.$eol.$tab; 
     147             
     148        $output .= $eol.'<h3 class="hndle ui-sortable-handle">'.$eol.$dtab.'<span>'.$label.'</span>'.$eol.$tab.'</h3>'.$eol.$tab.'<div class="inside">'.$eol.$tab;   
    148149         
    149150        return $output; 
     
    357358         
    358359        $opt_str = ''; 
     360         
     361        unset($options['cache']); 
    359362         
    360363        foreach ($options as $key => $value) : 
     
    406409    /** 
    407410     * 
     411     * Output plugin cache 
     412     * 
     413     */ 
     414    static function cache_info($cache, $label) { 
     415     
     416        $postbox = self::open_postbox($label, 'cache-info', true); 
     417         
     418        $opt_str = ''; 
     419         
     420        foreach ($cache as $key => $value) : 
     421         
     422            $key = 'Post-ID: '.$key; 
     423             
     424            ob_start(); 
     425     
     426            var_dump($value); 
     427             
     428            $value = ob_get_contents(); 
     429             
     430            $value = self::tag_it($value, 'pre', 3); 
     431             
     432            ob_end_clean(); 
     433         
     434            $value = str_replace(array("\r\n", "\n", "\r"), '<br />', $value); 
     435             
     436            $key = self::tag_it($key, 'td', 2, array('style' => 'width: 25%; border: solid 1px')); 
     437             
     438            $value = self::tag_it($value, 'td', 2, array('style' => 'border: solid 1px')); 
     439             
     440            $opt_str .= self::tag_it($key.$value, 'tr', 1); 
     441         
     442        endforeach; 
     443         
     444        $postbox .= self::tag_it($opt_str, 'table', 0, array('style' => 'border-collapse: collapse')); 
     445         
     446        $postbox .= self::close_postbox(); 
     447         
     448        return $postbox; 
     449         
     450    } 
     451     
     452    /** 
     453     * 
     454     * Output contents of the debug.log file 
     455     * 
     456     */ 
     457    static function debug_log_info($label) { 
     458     
     459        $postbox = self::open_postbox($label, 'error-log-info', true); 
     460         
     461        $filename = WP_CONTENT_DIR.'/debug.log'; 
     462         
     463        $errorlog = file_get_contents($filename); 
     464         
     465        if ($errorlog): 
     466             
     467            $postbox .= self::tag_it(nl2br($errorlog), 'div', 0, array('style' => 'border: 2px solid #cc0000; padding: 0.5em')); 
     468             
     469        else : 
     470         
     471            $postbox .= self::tag_it('file path: '.$filename, 'p'); 
     472             
     473        endif; 
     474         
     475        $postbox .= self::close_postbox(); 
     476         
     477        return $postbox; 
     478         
     479    } 
     480     
     481    /** 
     482     * 
    408483     * Output help box 
    409484     * 
  • rss-image-feed/tags/4.2.4/class-lib/RIF_AdminClass.php

    r1359722 r1375602  
    102102        _e('Define the size of the images and summary in your feed.', 'rss-image-feed'); 
    103103         
    104         if (is_plugin_active_for_network(RIF_BASE)) settings_errors(); 
     104        settings_errors(); 
    105105         
    106106        $action = (is_plugin_active_for_network(RIF_BASE)) ? '?page=rss-image-feed&action=update' : 'options.php'; 
     
    118118             
    119119            self::sortable('deep-down', self::debug_info(self::$options, __('Debug Info', 'rss-image-feed'))); 
     120             
     121            if (count(self::$options['cache']) > 0) self::sortable('cache-info', self::cache_info(self::$options['cache'], __('Cache', 'rss-image-feed'))); 
     122             
     123            if (true == WP_DEBUG_DISPLAY) self::sortable('errorlog-info', self::debug_log_info(__('Error Log', 'rss-image-feed'))); 
    120124         
    121125            self::close_tab(); 
     
    148152        add_settings_field('enclosure_tag', __('Add the &#34;enclosure&#34; tag:', 'rss-image-feed'), array($this, 'display_enclosure'), 'new_image_settings', 'image_rss_settings'); 
    149153         
     154        add_settings_field('notext', __('Don&#39t show content:', 'rss-image-feed'), array($this, 'display_notext'), 'new_image_settings', 'image_rss_settings'); 
     155         
    150156        add_settings_field('force_excerpt', __('Force Excerpt:', 'rss-image-feed'), array($this, 'display_force'), 'new_image_settings', 'image_rss_settings'); 
    151157         
    152158        add_settings_field('excerpt_size', __('Limit Excerpt:', 'rss-image-feed'), array($this, 'display_excptsize'), 'new_image_settings', 'image_rss_settings'); 
     159         
     160        $cachesize = count(self::$options['cache']); 
     161         
     162        $entry = ($cachesize > 1) ? __('entries', 'rss-image-feed') : __('entry', 'rss-image-feed'); 
     163         
     164        if ($cachesize > 0) add_settings_field('reset_cache', sprintf(__('Empty cache (%d %s):', 'rss-image-feed'), count(self::$options['cache']), $entry), array($this, 'reset_field'), 'new_image_settings', 'image_rss_settings', array(__('You can empty the plugin&#39;s cache here, if necessary.', 'rss-image-feed'))); 
     165         
     166        if (true == WP_DEBUG && true == WP_DEBUG_DISPLAY) : 
     167         
     168            $filename = WP_CONTENT_DIR.'/debug.log'; 
     169             
     170            $errorlog = file($filename); 
     171             
     172            $logsize = count($errorlog); 
     173         
     174            $entry = ($logsize > 1) ? __('entries', 'rss-image-feed') : __('entry', 'rss-image-feed'); 
     175             
     176            if ($logsize > 0) add_settings_field('reset_debug_log', sprintf(__('Empty debug log (%d %s):', 'rss-image-feed'), count($errorlog), $entry), array($this, 'reset_debug_field'), 'new_image_settings', 'image_rss_settings', array(__('You can empty the debug log here, if necessary.', 'rss-image-feed'))); 
     177             
     178        endif; 
    153179     
    154180    } 
     
    190216    } 
    191217     
     218    function display_notext() { 
     219         
     220        a5_checkbox('notext', 'rss_options[notext]', self::$options['notext'], __('Click, to not show post content.', 'rss-image-feed')); 
     221         
     222    } 
     223     
    192224    function display_force() { 
    193225         
     
    199231         
    200232        a5_number_field('excerpt_size', 'rss_options[excerpt_size]', self::$options['excerpt_size'], __('How long should the summary of the article be? Enter the number of sentences here.', 'rss-image-feed'), array('step' => 1)); 
     233         
     234    } 
     235     
     236    function reset_field($labels) { 
     237         
     238        a5_checkbox('reset_cache', 'rss_options[reset_cache]', @self::$options['reset_cache'], $labels[0]); 
     239         
     240    } 
     241     
     242    function reset_debug_field($labels) { 
     243         
     244        a5_checkbox('reset_debug_log', 'rss_options[reset_debug_log]', @self::$options['reset_debug_log'], $labels[0]); 
    201245         
    202246    } 
     
    209253        $newinput['enclosure'] = (isset($input['enclosure'])) ? true : false; 
    210254        $newinput['image_number'] = trim($input['image_number']); 
     255        $newinput['notext'] = (isset($input['notext'])) ? true : false; 
    211256        $newinput['force_excerpt'] = (isset($input['force_excerpt'])) ? true : false; 
    212257        $newinput['excerpt_size'] = trim($input['excerpt_size']); 
     
    216261            add_settings_error('rss_options', 'not-numeric-image-size', __('Please enter a numeric value for the image size.', 'rss-image-feed'), 'error'); 
    217262             
    218             $newinput['image_size'] = 200; 
     263            $newinput['image_size'] = 300; 
    219264             
    220265        endif; 
     
    230275        $newinput['excerpt_size'] = intval($newinput['excerpt_size']); 
    231276             
    232         if($newinput['image_size'] > 999) : 
    233          
    234             add_settings_error('rss_options', 'too-large-image-size', __('Imagesize too large. Please choose a value smaller than 1000.', 'rss-image-feed'), 'error'); 
    235              
    236             $newinput['image_size'] = 200; 
     277        if($newinput['image_size'] > 9999) : 
     278         
     279            add_settings_error('rss_options', 'too-large-image-size', __('Imagesize too large. Please choose a value smaller than 10000.', 'rss-image-feed'), 'error'); 
     280             
     281            $newinput['image_size'] = 300; 
    237282             
    238283        endif; 
     
    252297        self::$options['media_content'] = $newinput['media_content']; 
    253298        self::$options['enclosure'] = $newinput['enclosure']; 
     299        self::$options['notext'] = $newinput['notext']; 
    254300        self::$options['force_excerpt'] = $newinput['force_excerpt']; 
    255301        self::$options['excerpt_size'] = $newinput['excerpt_size']; 
    256302        self::$options['image_number'] = $newinput['image_number']; 
    257303         
     304        if (isset($input['reset_cache'])) add_settings_error('rss_options', 'empty-cache', __('Cache emptied.', 'rss-image-feed'), 'updated'); 
     305         
    258306        self::$options['cache'] = array(); 
     307         
     308        if (isset($input['reset_debug_log'])) : 
     309         
     310            $filename = WP_CONTENT_DIR.'/debug.log'; 
     311             
     312            file_put_contents($filename, ''); 
     313             
     314            add_settings_error('rss_options', 'empty-debug', __('Debug Log emptied.', 'rss-image-feed'), 'updated'); 
     315         
     316        endif; 
    259317         
    260318        return self::$options; 
  • rss-image-feed/tags/4.2.4/image-rss.php

    r1359722 r1375602  
    44Plugin URI: http://wasistlos.waldemarstoffel.com/plugins-fur-wordpress/image-feed 
    55Description: RSS Image Feed is not literally producing a feed of images but it adds the first image of the post to the normal feeds of your blog. Those images display even if you have the summary in the feed and not the content. 
    6 Version: 4.2.3 
     6Version: 4.2.4 
    77Author: Stefan Crämer 
    88Author URI: http://www.stefan-craemer.com 
     
    236236        if (!is_feed()) return $output; 
    237237         
     238        if (isset(self::$options['notext']) && self::$options['notext']) $output = ''; 
     239         
    238240        if (true === self::$options['force_excerpt']) : 
    239241         
     
    256258         
    257259        if (!is_feed()) return $content; 
     260         
     261        if (isset(self::$options['notext']) && self::$options['notext']) $content = ''; 
    258262         
    259263        $args = array( 
     
    281285        $id = get_the_ID(); 
    282286         
    283         $img_container = self::$options['cache'][$id]['image']; 
     287        $img_container = @self::$options['cache'][$id]['image']; 
    284288         
    285289        if (empty($img_container) && false !== $img_container) : 
     
    310314                $rif_height = ($rif_image_info[2]) ? ' height="'.$rif_image_info[2].'"' :''; 
    311315                 
    312                 $rif_image_size = (!self::$options['responsive']) ? '" width="'.$rif_width.'"'.$rif_height : '" style="max-width: '.$rif_width.'px; height: auto;"'; 
     316                $rif_image_size = '" width="'.$rif_width.'" '.$rif_height; 
     317                 
     318                if (!isset(self::$options['responsive']) || !self::$options['responsive']) $rif_image_size .= '" style="max-width: 100%; height: auto;"'; 
    313319             
    314320                $eol = "\n"; 
     
    347353            if (self::$options['enclosure']) : 
    348354             
    349                 $enclosure = self::$options['cache'][$post-ID]['enclosure']; 
     355                $enclosure = @self::$options['cache'][$post-ID]['enclosure']; 
    350356                 
    351357                if (!$enclosure) : 
    352358                 
    353359                    $enclosure = false; 
     360                     
     361                    $length = false; 
    354362             
    355363                    $upload_dir = wp_upload_dir(); 
     
    357365                    $full_image = A5_Image::thumbnail(array('id' => $post->ID, 'image_size' => 'full')); 
    358366                     
    359                     $image_src = str_replace( $upload_dir['baseurl'], $upload_dir['basedir'], $full_image[0] ); 
    360                      
    361                     $length = @filesize($image_src); 
     367                    if (strstr($full_image[0], $upload_dir['baseurl'])) : 
     368                     
     369                        $image_src = str_replace( $upload_dir['baseurl'], $upload_dir['basedir'], $full_image[0] ); 
     370                         
     371                        $length = @filesize($image_src); 
     372                         
     373                    endif; 
    362374                     
    363375                    if ($full_image) $enclosure = '<enclosure url="'.$full_image[0].'" length="'.$length.'" type="image/jpg" />'.$eol; 
     
    374386            if (self::$options['media_content']) : 
    375387             
    376                 $media_content = self::$options['cache'][$post-ID]['media_content']; 
     388                $media_content = @self::$options['cache'][$post-ID]['media_content']; 
    377389                 
    378390                if (!$media_content) : 
     
    411423     
    412424    function flush_widget_cache() { 
     425         
     426        if (count(self::$options['cache']) < 100) return; 
    413427         
    414428        global $wpdb; 
  • rss-image-feed/tags/4.2.4/languages/rss-image-feed-de_DE.po

    r1359722 r1375602  
    22msgstr "" 
    33"Project-Id-Version: RSS Image Feed\n" 
    4 "POT-Creation-Date: 2016-02-22 21:41+0200\n" 
    5 "PO-Revision-Date: 2016-02-22 21:43+0200\n" 
     4"POT-Creation-Date: 2016-03-21 13:59+0200\n" 
     5"PO-Revision-Date: 2016-03-21 14:00+0200\n" 
    66"Last-Translator: Stefan Crämer <translate@atelier-fuenf.de>\n" 
    77"Language-Team: Waldemar Stoffel <stoffel@atelier-fuenf.de>\n" 
     
    1919"X-Poedit-SearchPath-0: .\n" 
    2020 
    21 #: class-lib/A5_ImageClass.php:48 
     21#: class-lib/A5_ImageClass.php:46 
    2222msgid "Permalink to" 
    2323msgstr "Link zu:" 
    2424 
    25 #: class-lib/A5_OptionPageClass.php:31 image-rss.php:156 
     25#: class-lib/A5_OptionPageClass.php:31 image-rss.php:171 
    2626msgid "Settings" 
    2727msgstr "Einstellungen" 
    2828 
    29 #: class-lib/A5_OptionPageClass.php:145 
     29#: class-lib/A5_OptionPageClass.php:146 
    3030msgid "Click to toggle" 
    3131msgstr "Zum Umschalten klicken" 
    3232 
    33 #: class-lib/A5_OptionPageClass.php:384 
     33#: class-lib/A5_OptionPageClass.php:387 
    3434msgid "Not set" 
    3535msgstr "Nicht gesetzt" 
     
    5252msgstr "Info zur Fehlersuche" 
    5353 
    54 #: class-lib/RIF_AdminClass.php:138 
     54#: class-lib/RIF_AdminClass.php:121 
     55msgid "Cache" 
     56msgstr "Cache" 
     57 
     58#: class-lib/RIF_AdminClass.php:123 
     59msgid "Error Log" 
     60msgstr "Error Log" 
     61 
     62#: class-lib/RIF_AdminClass.php:142 
    5563msgid "RSS Settings" 
    5664msgstr "RSS Einstellungen" 
    5765 
    58 #: class-lib/RIF_AdminClass.php:140 
     66#: class-lib/RIF_AdminClass.php:144 
    5967msgid "Image Size:" 
    6068msgstr "Bildgröße:" 
    6169 
    62 #: class-lib/RIF_AdminClass.php:142 
     70#: class-lib/RIF_AdminClass.php:146 
    6371msgid "Make the size relative:" 
    6472msgstr "Mache die Bildgröße relativ:" 
    6573 
    66 #: class-lib/RIF_AdminClass.php:144 
     74#: class-lib/RIF_AdminClass.php:148 
    6775msgid "Image Number:" 
    6876msgstr "Bildnummer:" 
    6977 
    70 #: class-lib/RIF_AdminClass.php:146 
     78#: class-lib/RIF_AdminClass.php:150 
    7179msgid "Add the &#34;media:content&#34; tag:" 
    7280msgstr "Hänge das &#34;media:content&#34; Tag an den Feed." 
    7381 
    74 #: class-lib/RIF_AdminClass.php:148 
     82#: class-lib/RIF_AdminClass.php:152 
    7583msgid "Add the &#34;enclosure&#34; tag:" 
    7684msgstr "Hänge das &#34;enclosure&#34; Tag an den Feed." 
    7785 
    78 #: class-lib/RIF_AdminClass.php:150 
     86#: class-lib/RIF_AdminClass.php:154 
     87msgid "Don&#39t show content:" 
     88msgstr "Text nicht anzeigen:" 
     89 
     90#: class-lib/RIF_AdminClass.php:156 
    7991msgid "Force Excerpt:" 
    8092msgstr "Auszug erzwingen:" 
    8193 
    82 #: class-lib/RIF_AdminClass.php:152 
     94#: class-lib/RIF_AdminClass.php:158 
    8395msgid "Limit Excerpt:" 
    8496msgstr "Auszug limitieren:" 
    8597 
    86 #: class-lib/RIF_AdminClass.php:158 
     98#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     99msgid "entries" 
     100msgstr "Einträge" 
     101 
     102#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     103msgid "entry" 
     104msgstr "Eintrag" 
     105 
     106#: class-lib/RIF_AdminClass.php:164 
     107#, php-format 
     108msgid "Empty cache (%d %s):" 
     109msgstr "Cache leeren (%d %s):" 
     110 
     111#: class-lib/RIF_AdminClass.php:164 
     112msgid "You can empty the plugin&#39;s cache here, if necessary." 
     113msgstr "Falls nötig, kannst du hier den Cache des Plugins leeren." 
     114 
     115#: class-lib/RIF_AdminClass.php:176 
     116#, php-format 
     117msgid "Empty debug log (%d %s):" 
     118msgstr "Debug Log leeren (%d %s):" 
     119 
     120#: class-lib/RIF_AdminClass.php:176 
     121msgid "You can empty the debug log here, if necessary." 
     122msgstr "Falls nötig, kannst du hier das Debug Log leeren." 
     123 
     124#: class-lib/RIF_AdminClass.php:184 
    87125msgid "Change the size of the image and the excerpt here." 
    88126msgstr "Ändere die Größe des Bildes und des Auszuges hier." 
    89127 
    90 #: class-lib/RIF_AdminClass.php:164 
     128#: class-lib/RIF_AdminClass.php:190 
    91129msgid "" 
    92130"Give here only the longest side of the image. The smaller side will be " 
     
    96134"erstellen des Feed berechnet. Die Bilder werden nicht beschnitten." 
    97135 
    98 #: class-lib/RIF_AdminClass.php:170 
     136#: class-lib/RIF_AdminClass.php:196 
    99137msgid "" 
    100138"Click, to make image size relativ and not static. This might make the feed " 
     
    104142"deinen Feed mehr responsive machen." 
    105143 
    106 #: class-lib/RIF_AdminClass.php:176 
     144#: class-lib/RIF_AdminClass.php:202 
    107145msgid "Click, to include the &#34;media:content&#34; tag in the feed." 
    108146msgstr "Anklicken, um das &#34;media:content&#34; Tag zu setzen." 
    109147 
    110 #: class-lib/RIF_AdminClass.php:182 
     148#: class-lib/RIF_AdminClass.php:208 
    111149msgid "Click, to include the &#34;enclosure&#34; tag in the feed." 
    112150msgstr "Anklicken, um das &#34;enclosure&#34; Tag zu setzen." 
    113151 
    114 #: class-lib/RIF_AdminClass.php:188 
     152#: class-lib/RIF_AdminClass.php:214 
    115153#, php-format 
    116154msgid "" 
     
    121159"des Bildes an. Das Wort %s wird das letzte Bild des Artikels anzeigen." 
    122160 
    123 #: class-lib/RIF_AdminClass.php:194 
     161#: class-lib/RIF_AdminClass.php:220 
     162msgid "Click, to not show post content." 
     163msgstr "Anklicken, um keinen Text anzuzeigen." 
     164 
     165#: class-lib/RIF_AdminClass.php:226 
    124166msgid "" 
    125167"Click, to limit the post content to a summary if the post doesn&#39;t have " 
     
    129171"Auszug hat." 
    130172 
    131 #: class-lib/RIF_AdminClass.php:200 
     173#: class-lib/RIF_AdminClass.php:232 
    132174msgid "" 
    133175"How long should the summary of the article be? Enter the number of sentences " 
     
    137179"ein." 
    138180 
    139 #: class-lib/RIF_AdminClass.php:216 
     181#: class-lib/RIF_AdminClass.php:261 
    140182msgid "Please enter a numeric value for the image size." 
    141183msgstr "Bitte einen numerischen Wert für die Bildgröße eingeben." 
    142184 
    143 #: class-lib/RIF_AdminClass.php:224 
     185#: class-lib/RIF_AdminClass.php:269 
    144186msgid "Please enter a numeric value for the excerpt length." 
    145187msgstr "Bitte einen numerischen Wert für die Länge des Auszugs eingeben." 
    146188 
    147 #: class-lib/RIF_AdminClass.php:234 
    148 msgid "Imagesize too large. Please choose a value smaller than 1000." 
    149 msgstr "Bildgröße zu groß. Bitte wähle einen Wert kleiner als 1000." 
    150  
    151 #: image-rss.php:145 
     189#: class-lib/RIF_AdminClass.php:279 
     190msgid "Imagesize too large. Please choose a value smaller than 10000." 
     191msgstr "Bildgröße zu groß. Bitte wähle einen Wert kleiner als 10.000." 
     192 
     193#: class-lib/RIF_AdminClass.php:304 
     194msgid "Cache emptied." 
     195msgstr "Cache geleert." 
     196 
     197#: class-lib/RIF_AdminClass.php:314 
     198msgid "Debug Log emptied." 
     199msgstr "Debug Log geleert." 
     200 
     201#: image-rss.php:160 
    152202msgid "FAQ" 
    153203msgstr "FAQ" 
    154204 
    155 #: image-rss.php:146 
     205#: image-rss.php:161 
    156206msgid "Donate" 
    157207msgstr "Spenden" 
    158208 
    159 #: image-rss.php:164 
     209#: image-rss.php:179 
    160210msgid "RSS Image" 
    161211msgstr "RSS-Bild" 
  • rss-image-feed/tags/4.2.4/languages/rss-image-feed.pot

    r1359722 r1375602  
    33msgstr "" 
    44"Project-Id-Version: RSS Image Feed\n" 
    5 "POT-Creation-Date: 2016-02-22 21:44+0200\n" 
     5"POT-Creation-Date: 2016-03-21 13:59+0200\n" 
    66"PO-Revision-Date: 2016-02-22 21:44+0200\n" 
    77"Last-Translator: Stefan Crämer <translate@atelier-fuenf.de>\n" 
     
    2020"X-Poedit-SearchPathExcluded-0: *.js\n" 
    2121 
    22 #: class-lib/A5_ImageClass.php:48 
     22#: class-lib/A5_ImageClass.php:46 
    2323msgid "Permalink to" 
    2424msgstr "" 
    2525 
    26 #: class-lib/A5_OptionPageClass.php:31 image-rss.php:156 
     26#: class-lib/A5_OptionPageClass.php:31 image-rss.php:171 
    2727msgid "Settings" 
    2828msgstr "" 
    2929 
    30 #: class-lib/A5_OptionPageClass.php:145 
     30#: class-lib/A5_OptionPageClass.php:146 
    3131msgid "Click to toggle" 
    3232msgstr "" 
    3333 
    34 #: class-lib/A5_OptionPageClass.php:384 
     34#: class-lib/A5_OptionPageClass.php:387 
    3535msgid "Not set" 
    3636msgstr "" 
     
    5353msgstr "" 
    5454 
    55 #: class-lib/RIF_AdminClass.php:138 
     55#: class-lib/RIF_AdminClass.php:121 
     56msgid "Cache" 
     57msgstr "" 
     58 
     59#: class-lib/RIF_AdminClass.php:123 
     60msgid "Error Log" 
     61msgstr "" 
     62 
     63#: class-lib/RIF_AdminClass.php:142 
    5664msgid "RSS Settings" 
    5765msgstr "" 
    5866 
    59 #: class-lib/RIF_AdminClass.php:140 
     67#: class-lib/RIF_AdminClass.php:144 
    6068msgid "Image Size:" 
    6169msgstr "" 
    6270 
    63 #: class-lib/RIF_AdminClass.php:142 
     71#: class-lib/RIF_AdminClass.php:146 
    6472msgid "Make the size relative:" 
    6573msgstr "" 
    6674 
    67 #: class-lib/RIF_AdminClass.php:144 
     75#: class-lib/RIF_AdminClass.php:148 
    6876msgid "Image Number:" 
    6977msgstr "" 
    7078 
    71 #: class-lib/RIF_AdminClass.php:146 
     79#: class-lib/RIF_AdminClass.php:150 
    7280msgid "Add the &#34;media:content&#34; tag:" 
    7381msgstr "" 
    7482 
    75 #: class-lib/RIF_AdminClass.php:148 
     83#: class-lib/RIF_AdminClass.php:152 
    7684msgid "Add the &#34;enclosure&#34; tag:" 
    7785msgstr "" 
    7886 
    79 #: class-lib/RIF_AdminClass.php:150 
     87#: class-lib/RIF_AdminClass.php:154 
     88msgid "Don&#39t show content:" 
     89msgstr "" 
     90 
     91#: class-lib/RIF_AdminClass.php:156 
    8092msgid "Force Excerpt:" 
    8193msgstr "" 
    8294 
    83 #: class-lib/RIF_AdminClass.php:152 
     95#: class-lib/RIF_AdminClass.php:158 
    8496msgid "Limit Excerpt:" 
    8597msgstr "" 
    8698 
    87 #: class-lib/RIF_AdminClass.php:158 
     99#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     100msgid "entries" 
     101msgstr "" 
     102 
     103#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     104msgid "entry" 
     105msgstr "" 
     106 
     107#: class-lib/RIF_AdminClass.php:164 
     108#, php-format 
     109msgid "Empty cache (%d %s):" 
     110msgstr "" 
     111 
     112#: class-lib/RIF_AdminClass.php:164 
     113msgid "You can empty the plugin&#39;s cache here, if necessary." 
     114msgstr "" 
     115 
     116#: class-lib/RIF_AdminClass.php:176 
     117#, php-format 
     118msgid "Empty debug log (%d %s):" 
     119msgstr "" 
     120 
     121#: class-lib/RIF_AdminClass.php:176 
     122msgid "You can empty the debug log here, if necessary." 
     123msgstr "" 
     124 
     125#: class-lib/RIF_AdminClass.php:184 
    88126msgid "Change the size of the image and the excerpt here." 
    89127msgstr "" 
    90128 
    91 #: class-lib/RIF_AdminClass.php:164 
     129#: class-lib/RIF_AdminClass.php:190 
    92130msgid "" 
    93131"Give here only the longest side of the image. The smaller side will be " 
     
    95133msgstr "" 
    96134 
    97 #: class-lib/RIF_AdminClass.php:170 
     135#: class-lib/RIF_AdminClass.php:196 
    98136msgid "" 
    99137"Click, to make image size relativ and not static. This might make the feed " 
     
    101139msgstr "" 
    102140 
    103 #: class-lib/RIF_AdminClass.php:176 
     141#: class-lib/RIF_AdminClass.php:202 
    104142msgid "Click, to include the &#34;media:content&#34; tag in the feed." 
    105143msgstr "" 
    106144 
    107 #: class-lib/RIF_AdminClass.php:182 
     145#: class-lib/RIF_AdminClass.php:208 
    108146msgid "Click, to include the &#34;enclosure&#34; tag in the feed." 
    109147msgstr "" 
    110148 
    111 #: class-lib/RIF_AdminClass.php:188 
     149#: class-lib/RIF_AdminClass.php:214 
    112150#, php-format 
    113151msgid "" 
     
    116154msgstr "" 
    117155 
    118 #: class-lib/RIF_AdminClass.php:194 
     156#: class-lib/RIF_AdminClass.php:220 
     157msgid "Click, to not show post content." 
     158msgstr "" 
     159 
     160#: class-lib/RIF_AdminClass.php:226 
    119161msgid "" 
    120162"Click, to limit the post content to a summary if the post doesn&#39;t have " 
     
    122164msgstr "" 
    123165 
    124 #: class-lib/RIF_AdminClass.php:200 
     166#: class-lib/RIF_AdminClass.php:232 
    125167msgid "" 
    126168"How long should the summary of the article be? Enter the number of sentences " 
     
    128170msgstr "" 
    129171 
    130 #: class-lib/RIF_AdminClass.php:216 
     172#: class-lib/RIF_AdminClass.php:261 
    131173msgid "Please enter a numeric value for the image size." 
    132174msgstr "" 
    133175 
    134 #: class-lib/RIF_AdminClass.php:224 
     176#: class-lib/RIF_AdminClass.php:269 
    135177msgid "Please enter a numeric value for the excerpt length." 
    136178msgstr "" 
    137179 
    138 #: class-lib/RIF_AdminClass.php:234 
    139 msgid "Imagesize too large. Please choose a value smaller than 1000." 
    140 msgstr "" 
    141  
    142 #: image-rss.php:145 
     180#: class-lib/RIF_AdminClass.php:279 
     181msgid "Imagesize too large. Please choose a value smaller than 10000." 
     182msgstr "" 
     183 
     184#: class-lib/RIF_AdminClass.php:304 
     185msgid "Cache emptied." 
     186msgstr "" 
     187 
     188#: class-lib/RIF_AdminClass.php:314 
     189msgid "Debug Log emptied." 
     190msgstr "" 
     191 
     192#: image-rss.php:160 
    143193msgid "FAQ" 
    144194msgstr "" 
    145195 
    146 #: image-rss.php:146 
     196#: image-rss.php:161 
    147197msgid "Donate" 
    148198msgstr "" 
    149199 
    150 #: image-rss.php:164 
     200#: image-rss.php:179 
    151201msgid "RSS Image" 
    152202msgstr "" 
  • rss-image-feed/tags/4.2.4/readme.txt

    r1359722 r1375602  
    55Requires at least: 2.7 
    66Tested up to: 4.5 
    7 Stable tag: 4.2.3 
     7Stable tag: 4.2.4 
    88 
    99The RSS Image Feed adds the first image of a post to your feeds, even in firefox and even if you only display the excerpt. 
     
    3232 
    3333== Changelog == 
     34 
     35= 4.2.4 = 
     36 
     37* made downwards compatible with versions prior to WP 4.4 again 
     38* some minor bugfixes 
    3439 
    3540= 4.2.3 = 
     
    211216 
    212217Added <media:content> tag to the feed as well 
     218 
     219= 4.2.4 = 
     220 
     221Made downwards compatible with versions prior to WP 4.4 again; some minor bugfixes 
  • rss-image-feed/trunk/class-lib/A5_ExcerptClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets the excerpt of a post according to some parameters 
  • rss-image-feed/trunk/class-lib/A5_FormFieldClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets all sort of input fields for plugins by Atelier 5  
     
    1616class A5_FormField { 
    1717     
    18     const version = '1.0 beta 20160127 RIF'; 
     18    const version = '1.0 beta 20160321 RIF'; 
    1919     
    2020    public $formfield; 
  • rss-image-feed/trunk/class-lib/A5_ImageClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets the alt and title tag for attachments 
     
    4242        endif; 
    4343         
    44         if (!isset($attachment)) return false; 
    45          
    4644        $title = get_the_title($id); 
    4745         
    4846        $title_tag = __('Permalink to', 'rss-image-feed').' '.esc_attr($title); 
    49                    
    50         $image_alt = trim(strip_tags( get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true) )); 
    51          
    52         $image_title = trim(strip_tags( $attachment->post_title )); 
     47         
     48        $image_alt = (isset($attachment)) ? trim(strip_tags(get_post_meta($attachment->ID, '_wp_attachment_image_alt', true))) : '';     
     49        $image_title = (isset($attachment)) ? trim(strip_tags($attachment->post_title)) : ''; 
    5350     
    5451        $image_alt = (empty($image_alt)) ? esc_attr($title) : esc_attr($image_alt); 
     
    8885        if (!isset($image_size)) $image_size = array($width, $height); 
    8986         
     87        if (is_string($image_size)) : 
     88         
     89            global $_wp_additional_image_sizes; 
     90             
     91            $width = ('full' == $image_size) ? 9999 : $_wp_additional_image_sizes[$image_size]['width']; 
     92         
     93        endif; 
     94         
    9095        if (!isset($number)) : 
    9196         
     
    402407        if (!$thumb) return false; 
    403408         
    404         if ($thumb[3] == false) : 
    405          
    406             if (!is_array($size)) : 
    407              
    408                 $image_size = self::get_image_size($size); 
    409                  
    410                 if (false == $image_size) return $thumb; 
    411                  
    412                 $size = array($image_size['width'], (true == $image_size['crop']) ? $image_size['height'] : '9999'); 
    413              
    414             endif; 
    415          
    416             $src = explode(',', wp_get_attachment_image_srcset($attachment_id, $size)); 
    417              
    418             foreach ($src as $img) : 
    419              
    420                 $img_src = explode(' ', trim($img)); 
    421                  
    422                 $width = str_replace('w', '', $img_src[1]); 
    423                  
    424                 if ($size[0] <= $width) : 
    425                  
    426                     $image[$width] = $img_src[0]; 
    427                      
     409        if (function_exists('wp_get_attachment_image_srcset')) : 
     410         
     411            if ($thumb[3] == false) : 
     412             
     413                if (!is_array($size)) : 
     414                 
     415                    $image_size = self::get_image_size($size); 
     416                     
     417                    if (false == $image_size) return $thumb; 
     418                     
     419                    $size = array($image_size['width'], (true == $image_size['crop']) ? $image_size['height'] : '9999'); 
     420                 
    428421                endif; 
    429422             
    430             endforeach; 
    431              
    432             if (isset($image)) : 
    433              
    434                 ksort($image); 
    435              
    436                 $thumb[0] = current($image); 
    437                  
    438             endif; 
    439          
     423                $src = explode(',', wp_get_attachment_image_srcset($attachment_id, $size)); 
     424                 
     425                foreach ($src as $img) : 
     426                 
     427                    $img_src = explode(' ', trim($img)); 
     428                     
     429                    $width = str_replace('w', '', $img_src[1]); 
     430                     
     431                    if ($size[0] <= $width) : 
     432                     
     433                        $image[$width] = $img_src[0]; 
     434                         
     435                    endif; 
     436                 
     437                endforeach; 
     438                 
     439                if (isset($image)) : 
     440                 
     441                    ksort($image); 
     442                 
     443                    $thumb[0] = current($image); 
     444                     
     445                endif; 
     446             
     447            endif; 
     448             
    440449        endif; 
    441450         
  • rss-image-feed/trunk/class-lib/A5_OptionPageClass.php

    r1359722 r1375602  
    66 * 
    77 * @ A5 Plugin Framework 
    8  * Version: 1.0 beta 20160127 
     8 * Version: 1.0 beta 20160321 
    99 * 
    1010 * Gets all sort of containers for the flexible A5 settings pages 
     
    142142         
    143143        $class = (false === $closed) ? '' : ' closed'; 
    144      
    145         $output = $eol.'<div id="'.$id.'" class="postbox'.$class.'">'.$eol.$tab.'<div class="handlediv" title="'.__('Click to toggle').'">'.$eol.$dtab.'<br />'.$eol.$tab.'</div>'.$eol.$tab; 
    146              
    147         $output .= $eol.'<h3 class="hndle">'.$eol.$dtab.'<span>'.$label.'</span>'.$eol.$tab.'</h3>'.$eol.$tab.'<div class="inside">'.$eol.$tab;  
     144        $area = (false === $closed) ? 'true' : 'false'; 
     145     
     146        $output = $eol.'<div id="'.$id.'" class="postbox'.$class.'">'.$eol.$tab.'<div class="handlediv" title="'.__('Click to toggle').'" area-expanded="'.$area.'">'.$eol.$dtab.'<br />'.$eol.$tab.'</div>'.$eol.$tab; 
     147             
     148        $output .= $eol.'<h3 class="hndle ui-sortable-handle">'.$eol.$dtab.'<span>'.$label.'</span>'.$eol.$tab.'</h3>'.$eol.$tab.'<div class="inside">'.$eol.$tab;   
    148149         
    149150        return $output; 
     
    357358         
    358359        $opt_str = ''; 
     360         
     361        unset($options['cache']); 
    359362         
    360363        foreach ($options as $key => $value) : 
     
    406409    /** 
    407410     * 
     411     * Output plugin cache 
     412     * 
     413     */ 
     414    static function cache_info($cache, $label) { 
     415     
     416        $postbox = self::open_postbox($label, 'cache-info', true); 
     417         
     418        $opt_str = ''; 
     419         
     420        foreach ($cache as $key => $value) : 
     421         
     422            $key = 'Post-ID: '.$key; 
     423             
     424            ob_start(); 
     425     
     426            var_dump($value); 
     427             
     428            $value = ob_get_contents(); 
     429             
     430            $value = self::tag_it($value, 'pre', 3); 
     431             
     432            ob_end_clean(); 
     433         
     434            $value = str_replace(array("\r\n", "\n", "\r"), '<br />', $value); 
     435             
     436            $key = self::tag_it($key, 'td', 2, array('style' => 'width: 25%; border: solid 1px')); 
     437             
     438            $value = self::tag_it($value, 'td', 2, array('style' => 'border: solid 1px')); 
     439             
     440            $opt_str .= self::tag_it($key.$value, 'tr', 1); 
     441         
     442        endforeach; 
     443         
     444        $postbox .= self::tag_it($opt_str, 'table', 0, array('style' => 'border-collapse: collapse')); 
     445         
     446        $postbox .= self::close_postbox(); 
     447         
     448        return $postbox; 
     449         
     450    } 
     451     
     452    /** 
     453     * 
     454     * Output contents of the debug.log file 
     455     * 
     456     */ 
     457    static function debug_log_info($label) { 
     458     
     459        $postbox = self::open_postbox($label, 'error-log-info', true); 
     460         
     461        $filename = WP_CONTENT_DIR.'/debug.log'; 
     462         
     463        $errorlog = file_get_contents($filename); 
     464         
     465        if ($errorlog): 
     466             
     467            $postbox .= self::tag_it(nl2br($errorlog), 'div', 0, array('style' => 'border: 2px solid #cc0000; padding: 0.5em')); 
     468             
     469        else : 
     470         
     471            $postbox .= self::tag_it('file path: '.$filename, 'p'); 
     472             
     473        endif; 
     474         
     475        $postbox .= self::close_postbox(); 
     476         
     477        return $postbox; 
     478         
     479    } 
     480     
     481    /** 
     482     * 
    408483     * Output help box 
    409484     * 
  • rss-image-feed/trunk/class-lib/RIF_AdminClass.php

    r1359722 r1375602  
    102102        _e('Define the size of the images and summary in your feed.', 'rss-image-feed'); 
    103103         
    104         if (is_plugin_active_for_network(RIF_BASE)) settings_errors(); 
     104        settings_errors(); 
    105105         
    106106        $action = (is_plugin_active_for_network(RIF_BASE)) ? '?page=rss-image-feed&action=update' : 'options.php'; 
     
    118118             
    119119            self::sortable('deep-down', self::debug_info(self::$options, __('Debug Info', 'rss-image-feed'))); 
     120             
     121            if (count(self::$options['cache']) > 0) self::sortable('cache-info', self::cache_info(self::$options['cache'], __('Cache', 'rss-image-feed'))); 
     122             
     123            if (true == WP_DEBUG_DISPLAY) self::sortable('errorlog-info', self::debug_log_info(__('Error Log', 'rss-image-feed'))); 
    120124         
    121125            self::close_tab(); 
     
    148152        add_settings_field('enclosure_tag', __('Add the &#34;enclosure&#34; tag:', 'rss-image-feed'), array($this, 'display_enclosure'), 'new_image_settings', 'image_rss_settings'); 
    149153         
     154        add_settings_field('notext', __('Don&#39t show content:', 'rss-image-feed'), array($this, 'display_notext'), 'new_image_settings', 'image_rss_settings'); 
     155         
    150156        add_settings_field('force_excerpt', __('Force Excerpt:', 'rss-image-feed'), array($this, 'display_force'), 'new_image_settings', 'image_rss_settings'); 
    151157         
    152158        add_settings_field('excerpt_size', __('Limit Excerpt:', 'rss-image-feed'), array($this, 'display_excptsize'), 'new_image_settings', 'image_rss_settings'); 
     159         
     160        $cachesize = count(self::$options['cache']); 
     161         
     162        $entry = ($cachesize > 1) ? __('entries', 'rss-image-feed') : __('entry', 'rss-image-feed'); 
     163         
     164        if ($cachesize > 0) add_settings_field('reset_cache', sprintf(__('Empty cache (%d %s):', 'rss-image-feed'), count(self::$options['cache']), $entry), array($this, 'reset_field'), 'new_image_settings', 'image_rss_settings', array(__('You can empty the plugin&#39;s cache here, if necessary.', 'rss-image-feed'))); 
     165         
     166        if (true == WP_DEBUG && true == WP_DEBUG_DISPLAY) : 
     167         
     168            $filename = WP_CONTENT_DIR.'/debug.log'; 
     169             
     170            $errorlog = file($filename); 
     171             
     172            $logsize = count($errorlog); 
     173         
     174            $entry = ($logsize > 1) ? __('entries', 'rss-image-feed') : __('entry', 'rss-image-feed'); 
     175             
     176            if ($logsize > 0) add_settings_field('reset_debug_log', sprintf(__('Empty debug log (%d %s):', 'rss-image-feed'), count($errorlog), $entry), array($this, 'reset_debug_field'), 'new_image_settings', 'image_rss_settings', array(__('You can empty the debug log here, if necessary.', 'rss-image-feed'))); 
     177             
     178        endif; 
    153179     
    154180    } 
     
    190216    } 
    191217     
     218    function display_notext() { 
     219         
     220        a5_checkbox('notext', 'rss_options[notext]', self::$options['notext'], __('Click, to not show post content.', 'rss-image-feed')); 
     221         
     222    } 
     223     
    192224    function display_force() { 
    193225         
     
    199231         
    200232        a5_number_field('excerpt_size', 'rss_options[excerpt_size]', self::$options['excerpt_size'], __('How long should the summary of the article be? Enter the number of sentences here.', 'rss-image-feed'), array('step' => 1)); 
     233         
     234    } 
     235     
     236    function reset_field($labels) { 
     237         
     238        a5_checkbox('reset_cache', 'rss_options[reset_cache]', @self::$options['reset_cache'], $labels[0]); 
     239         
     240    } 
     241     
     242    function reset_debug_field($labels) { 
     243         
     244        a5_checkbox('reset_debug_log', 'rss_options[reset_debug_log]', @self::$options['reset_debug_log'], $labels[0]); 
    201245         
    202246    } 
     
    209253        $newinput['enclosure'] = (isset($input['enclosure'])) ? true : false; 
    210254        $newinput['image_number'] = trim($input['image_number']); 
     255        $newinput['notext'] = (isset($input['notext'])) ? true : false; 
    211256        $newinput['force_excerpt'] = (isset($input['force_excerpt'])) ? true : false; 
    212257        $newinput['excerpt_size'] = trim($input['excerpt_size']); 
     
    216261            add_settings_error('rss_options', 'not-numeric-image-size', __('Please enter a numeric value for the image size.', 'rss-image-feed'), 'error'); 
    217262             
    218             $newinput['image_size'] = 200; 
     263            $newinput['image_size'] = 300; 
    219264             
    220265        endif; 
     
    230275        $newinput['excerpt_size'] = intval($newinput['excerpt_size']); 
    231276             
    232         if($newinput['image_size'] > 999) : 
    233          
    234             add_settings_error('rss_options', 'too-large-image-size', __('Imagesize too large. Please choose a value smaller than 1000.', 'rss-image-feed'), 'error'); 
    235              
    236             $newinput['image_size'] = 200; 
     277        if($newinput['image_size'] > 9999) : 
     278         
     279            add_settings_error('rss_options', 'too-large-image-size', __('Imagesize too large. Please choose a value smaller than 10000.', 'rss-image-feed'), 'error'); 
     280             
     281            $newinput['image_size'] = 300; 
    237282             
    238283        endif; 
     
    252297        self::$options['media_content'] = $newinput['media_content']; 
    253298        self::$options['enclosure'] = $newinput['enclosure']; 
     299        self::$options['notext'] = $newinput['notext']; 
    254300        self::$options['force_excerpt'] = $newinput['force_excerpt']; 
    255301        self::$options['excerpt_size'] = $newinput['excerpt_size']; 
    256302        self::$options['image_number'] = $newinput['image_number']; 
    257303         
     304        if (isset($input['reset_cache'])) add_settings_error('rss_options', 'empty-cache', __('Cache emptied.', 'rss-image-feed'), 'updated'); 
     305         
    258306        self::$options['cache'] = array(); 
     307         
     308        if (isset($input['reset_debug_log'])) : 
     309         
     310            $filename = WP_CONTENT_DIR.'/debug.log'; 
     311             
     312            file_put_contents($filename, ''); 
     313             
     314            add_settings_error('rss_options', 'empty-debug', __('Debug Log emptied.', 'rss-image-feed'), 'updated'); 
     315         
     316        endif; 
    259317         
    260318        return self::$options; 
  • rss-image-feed/trunk/image-rss.php

    r1359722 r1375602  
    44Plugin URI: http://wasistlos.waldemarstoffel.com/plugins-fur-wordpress/image-feed 
    55Description: RSS Image Feed is not literally producing a feed of images but it adds the first image of the post to the normal feeds of your blog. Those images display even if you have the summary in the feed and not the content. 
    6 Version: 4.2.3 
     6Version: 4.2.4 
    77Author: Stefan Crämer 
    88Author URI: http://www.stefan-craemer.com 
     
    236236        if (!is_feed()) return $output; 
    237237         
     238        if (isset(self::$options['notext']) && self::$options['notext']) $output = ''; 
     239         
    238240        if (true === self::$options['force_excerpt']) : 
    239241         
     
    256258         
    257259        if (!is_feed()) return $content; 
     260         
     261        if (isset(self::$options['notext']) && self::$options['notext']) $content = ''; 
    258262         
    259263        $args = array( 
     
    281285        $id = get_the_ID(); 
    282286         
    283         $img_container = self::$options['cache'][$id]['image']; 
     287        $img_container = @self::$options['cache'][$id]['image']; 
    284288         
    285289        if (empty($img_container) && false !== $img_container) : 
     
    310314                $rif_height = ($rif_image_info[2]) ? ' height="'.$rif_image_info[2].'"' :''; 
    311315                 
    312                 $rif_image_size = (!self::$options['responsive']) ? '" width="'.$rif_width.'"'.$rif_height : '" style="max-width: '.$rif_width.'px; height: auto;"'; 
     316                $rif_image_size = '" width="'.$rif_width.'" '.$rif_height; 
     317                 
     318                if (!isset(self::$options['responsive']) || !self::$options['responsive']) $rif_image_size .= '" style="max-width: 100%; height: auto;"'; 
    313319             
    314320                $eol = "\n"; 
     
    347353            if (self::$options['enclosure']) : 
    348354             
    349                 $enclosure = self::$options['cache'][$post-ID]['enclosure']; 
     355                $enclosure = @self::$options['cache'][$post-ID]['enclosure']; 
    350356                 
    351357                if (!$enclosure) : 
    352358                 
    353359                    $enclosure = false; 
     360                     
     361                    $length = false; 
    354362             
    355363                    $upload_dir = wp_upload_dir(); 
     
    357365                    $full_image = A5_Image::thumbnail(array('id' => $post->ID, 'image_size' => 'full')); 
    358366                     
    359                     $image_src = str_replace( $upload_dir['baseurl'], $upload_dir['basedir'], $full_image[0] ); 
    360                      
    361                     $length = @filesize($image_src); 
     367                    if (strstr($full_image[0], $upload_dir['baseurl'])) : 
     368                     
     369                        $image_src = str_replace( $upload_dir['baseurl'], $upload_dir['basedir'], $full_image[0] ); 
     370                         
     371                        $length = @filesize($image_src); 
     372                         
     373                    endif; 
    362374                     
    363375                    if ($full_image) $enclosure = '<enclosure url="'.$full_image[0].'" length="'.$length.'" type="image/jpg" />'.$eol; 
     
    374386            if (self::$options['media_content']) : 
    375387             
    376                 $media_content = self::$options['cache'][$post-ID]['media_content']; 
     388                $media_content = @self::$options['cache'][$post-ID]['media_content']; 
    377389                 
    378390                if (!$media_content) : 
     
    411423     
    412424    function flush_widget_cache() { 
     425         
     426        if (count(self::$options['cache']) < 100) return; 
    413427         
    414428        global $wpdb; 
  • rss-image-feed/trunk/languages/rss-image-feed-de_DE.po

    r1359722 r1375602  
    22msgstr "" 
    33"Project-Id-Version: RSS Image Feed\n" 
    4 "POT-Creation-Date: 2016-02-22 21:41+0200\n" 
    5 "PO-Revision-Date: 2016-02-22 21:43+0200\n" 
     4"POT-Creation-Date: 2016-03-21 13:59+0200\n" 
     5"PO-Revision-Date: 2016-03-21 14:00+0200\n" 
    66"Last-Translator: Stefan Crämer <translate@atelier-fuenf.de>\n" 
    77"Language-Team: Waldemar Stoffel <stoffel@atelier-fuenf.de>\n" 
     
    1919"X-Poedit-SearchPath-0: .\n" 
    2020 
    21 #: class-lib/A5_ImageClass.php:48 
     21#: class-lib/A5_ImageClass.php:46 
    2222msgid "Permalink to" 
    2323msgstr "Link zu:" 
    2424 
    25 #: class-lib/A5_OptionPageClass.php:31 image-rss.php:156 
     25#: class-lib/A5_OptionPageClass.php:31 image-rss.php:171 
    2626msgid "Settings" 
    2727msgstr "Einstellungen" 
    2828 
    29 #: class-lib/A5_OptionPageClass.php:145 
     29#: class-lib/A5_OptionPageClass.php:146 
    3030msgid "Click to toggle" 
    3131msgstr "Zum Umschalten klicken" 
    3232 
    33 #: class-lib/A5_OptionPageClass.php:384 
     33#: class-lib/A5_OptionPageClass.php:387 
    3434msgid "Not set" 
    3535msgstr "Nicht gesetzt" 
     
    5252msgstr "Info zur Fehlersuche" 
    5353 
    54 #: class-lib/RIF_AdminClass.php:138 
     54#: class-lib/RIF_AdminClass.php:121 
     55msgid "Cache" 
     56msgstr "Cache" 
     57 
     58#: class-lib/RIF_AdminClass.php:123 
     59msgid "Error Log" 
     60msgstr "Error Log" 
     61 
     62#: class-lib/RIF_AdminClass.php:142 
    5563msgid "RSS Settings" 
    5664msgstr "RSS Einstellungen" 
    5765 
    58 #: class-lib/RIF_AdminClass.php:140 
     66#: class-lib/RIF_AdminClass.php:144 
    5967msgid "Image Size:" 
    6068msgstr "Bildgröße:" 
    6169 
    62 #: class-lib/RIF_AdminClass.php:142 
     70#: class-lib/RIF_AdminClass.php:146 
    6371msgid "Make the size relative:" 
    6472msgstr "Mache die Bildgröße relativ:" 
    6573 
    66 #: class-lib/RIF_AdminClass.php:144 
     74#: class-lib/RIF_AdminClass.php:148 
    6775msgid "Image Number:" 
    6876msgstr "Bildnummer:" 
    6977 
    70 #: class-lib/RIF_AdminClass.php:146 
     78#: class-lib/RIF_AdminClass.php:150 
    7179msgid "Add the &#34;media:content&#34; tag:" 
    7280msgstr "Hänge das &#34;media:content&#34; Tag an den Feed." 
    7381 
    74 #: class-lib/RIF_AdminClass.php:148 
     82#: class-lib/RIF_AdminClass.php:152 
    7583msgid "Add the &#34;enclosure&#34; tag:" 
    7684msgstr "Hänge das &#34;enclosure&#34; Tag an den Feed." 
    7785 
    78 #: class-lib/RIF_AdminClass.php:150 
     86#: class-lib/RIF_AdminClass.php:154 
     87msgid "Don&#39t show content:" 
     88msgstr "Text nicht anzeigen:" 
     89 
     90#: class-lib/RIF_AdminClass.php:156 
    7991msgid "Force Excerpt:" 
    8092msgstr "Auszug erzwingen:" 
    8193 
    82 #: class-lib/RIF_AdminClass.php:152 
     94#: class-lib/RIF_AdminClass.php:158 
    8395msgid "Limit Excerpt:" 
    8496msgstr "Auszug limitieren:" 
    8597 
    86 #: class-lib/RIF_AdminClass.php:158 
     98#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     99msgid "entries" 
     100msgstr "Einträge" 
     101 
     102#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     103msgid "entry" 
     104msgstr "Eintrag" 
     105 
     106#: class-lib/RIF_AdminClass.php:164 
     107#, php-format 
     108msgid "Empty cache (%d %s):" 
     109msgstr "Cache leeren (%d %s):" 
     110 
     111#: class-lib/RIF_AdminClass.php:164 
     112msgid "You can empty the plugin&#39;s cache here, if necessary." 
     113msgstr "Falls nötig, kannst du hier den Cache des Plugins leeren." 
     114 
     115#: class-lib/RIF_AdminClass.php:176 
     116#, php-format 
     117msgid "Empty debug log (%d %s):" 
     118msgstr "Debug Log leeren (%d %s):" 
     119 
     120#: class-lib/RIF_AdminClass.php:176 
     121msgid "You can empty the debug log here, if necessary." 
     122msgstr "Falls nötig, kannst du hier das Debug Log leeren." 
     123 
     124#: class-lib/RIF_AdminClass.php:184 
    87125msgid "Change the size of the image and the excerpt here." 
    88126msgstr "Ändere die Größe des Bildes und des Auszuges hier." 
    89127 
    90 #: class-lib/RIF_AdminClass.php:164 
     128#: class-lib/RIF_AdminClass.php:190 
    91129msgid "" 
    92130"Give here only the longest side of the image. The smaller side will be " 
     
    96134"erstellen des Feed berechnet. Die Bilder werden nicht beschnitten." 
    97135 
    98 #: class-lib/RIF_AdminClass.php:170 
     136#: class-lib/RIF_AdminClass.php:196 
    99137msgid "" 
    100138"Click, to make image size relativ and not static. This might make the feed " 
     
    104142"deinen Feed mehr responsive machen." 
    105143 
    106 #: class-lib/RIF_AdminClass.php:176 
     144#: class-lib/RIF_AdminClass.php:202 
    107145msgid "Click, to include the &#34;media:content&#34; tag in the feed." 
    108146msgstr "Anklicken, um das &#34;media:content&#34; Tag zu setzen." 
    109147 
    110 #: class-lib/RIF_AdminClass.php:182 
     148#: class-lib/RIF_AdminClass.php:208 
    111149msgid "Click, to include the &#34;enclosure&#34; tag in the feed." 
    112150msgstr "Anklicken, um das &#34;enclosure&#34; Tag zu setzen." 
    113151 
    114 #: class-lib/RIF_AdminClass.php:188 
     152#: class-lib/RIF_AdminClass.php:214 
    115153#, php-format 
    116154msgid "" 
     
    121159"des Bildes an. Das Wort %s wird das letzte Bild des Artikels anzeigen." 
    122160 
    123 #: class-lib/RIF_AdminClass.php:194 
     161#: class-lib/RIF_AdminClass.php:220 
     162msgid "Click, to not show post content." 
     163msgstr "Anklicken, um keinen Text anzuzeigen." 
     164 
     165#: class-lib/RIF_AdminClass.php:226 
    124166msgid "" 
    125167"Click, to limit the post content to a summary if the post doesn&#39;t have " 
     
    129171"Auszug hat." 
    130172 
    131 #: class-lib/RIF_AdminClass.php:200 
     173#: class-lib/RIF_AdminClass.php:232 
    132174msgid "" 
    133175"How long should the summary of the article be? Enter the number of sentences " 
     
    137179"ein." 
    138180 
    139 #: class-lib/RIF_AdminClass.php:216 
     181#: class-lib/RIF_AdminClass.php:261 
    140182msgid "Please enter a numeric value for the image size." 
    141183msgstr "Bitte einen numerischen Wert für die Bildgröße eingeben." 
    142184 
    143 #: class-lib/RIF_AdminClass.php:224 
     185#: class-lib/RIF_AdminClass.php:269 
    144186msgid "Please enter a numeric value for the excerpt length." 
    145187msgstr "Bitte einen numerischen Wert für die Länge des Auszugs eingeben." 
    146188 
    147 #: class-lib/RIF_AdminClass.php:234 
    148 msgid "Imagesize too large. Please choose a value smaller than 1000." 
    149 msgstr "Bildgröße zu groß. Bitte wähle einen Wert kleiner als 1000." 
    150  
    151 #: image-rss.php:145 
     189#: class-lib/RIF_AdminClass.php:279 
     190msgid "Imagesize too large. Please choose a value smaller than 10000." 
     191msgstr "Bildgröße zu groß. Bitte wähle einen Wert kleiner als 10.000." 
     192 
     193#: class-lib/RIF_AdminClass.php:304 
     194msgid "Cache emptied." 
     195msgstr "Cache geleert." 
     196 
     197#: class-lib/RIF_AdminClass.php:314 
     198msgid "Debug Log emptied." 
     199msgstr "Debug Log geleert." 
     200 
     201#: image-rss.php:160 
    152202msgid "FAQ" 
    153203msgstr "FAQ" 
    154204 
    155 #: image-rss.php:146 
     205#: image-rss.php:161 
    156206msgid "Donate" 
    157207msgstr "Spenden" 
    158208 
    159 #: image-rss.php:164 
     209#: image-rss.php:179 
    160210msgid "RSS Image" 
    161211msgstr "RSS-Bild" 
  • rss-image-feed/trunk/languages/rss-image-feed.pot

    r1359722 r1375602  
    33msgstr "" 
    44"Project-Id-Version: RSS Image Feed\n" 
    5 "POT-Creation-Date: 2016-02-22 21:44+0200\n" 
     5"POT-Creation-Date: 2016-03-21 13:59+0200\n" 
    66"PO-Revision-Date: 2016-02-22 21:44+0200\n" 
    77"Last-Translator: Stefan Crämer <translate@atelier-fuenf.de>\n" 
     
    2020"X-Poedit-SearchPathExcluded-0: *.js\n" 
    2121 
    22 #: class-lib/A5_ImageClass.php:48 
     22#: class-lib/A5_ImageClass.php:46 
    2323msgid "Permalink to" 
    2424msgstr "" 
    2525 
    26 #: class-lib/A5_OptionPageClass.php:31 image-rss.php:156 
     26#: class-lib/A5_OptionPageClass.php:31 image-rss.php:171 
    2727msgid "Settings" 
    2828msgstr "" 
    2929 
    30 #: class-lib/A5_OptionPageClass.php:145 
     30#: class-lib/A5_OptionPageClass.php:146 
    3131msgid "Click to toggle" 
    3232msgstr "" 
    3333 
    34 #: class-lib/A5_OptionPageClass.php:384 
     34#: class-lib/A5_OptionPageClass.php:387 
    3535msgid "Not set" 
    3636msgstr "" 
     
    5353msgstr "" 
    5454 
    55 #: class-lib/RIF_AdminClass.php:138 
     55#: class-lib/RIF_AdminClass.php:121 
     56msgid "Cache" 
     57msgstr "" 
     58 
     59#: class-lib/RIF_AdminClass.php:123 
     60msgid "Error Log" 
     61msgstr "" 
     62 
     63#: class-lib/RIF_AdminClass.php:142 
    5664msgid "RSS Settings" 
    5765msgstr "" 
    5866 
    59 #: class-lib/RIF_AdminClass.php:140 
     67#: class-lib/RIF_AdminClass.php:144 
    6068msgid "Image Size:" 
    6169msgstr "" 
    6270 
    63 #: class-lib/RIF_AdminClass.php:142 
     71#: class-lib/RIF_AdminClass.php:146 
    6472msgid "Make the size relative:" 
    6573msgstr "" 
    6674 
    67 #: class-lib/RIF_AdminClass.php:144 
     75#: class-lib/RIF_AdminClass.php:148 
    6876msgid "Image Number:" 
    6977msgstr "" 
    7078 
    71 #: class-lib/RIF_AdminClass.php:146 
     79#: class-lib/RIF_AdminClass.php:150 
    7280msgid "Add the &#34;media:content&#34; tag:" 
    7381msgstr "" 
    7482 
    75 #: class-lib/RIF_AdminClass.php:148 
     83#: class-lib/RIF_AdminClass.php:152 
    7684msgid "Add the &#34;enclosure&#34; tag:" 
    7785msgstr "" 
    7886 
    79 #: class-lib/RIF_AdminClass.php:150 
     87#: class-lib/RIF_AdminClass.php:154 
     88msgid "Don&#39t show content:" 
     89msgstr "" 
     90 
     91#: class-lib/RIF_AdminClass.php:156 
    8092msgid "Force Excerpt:" 
    8193msgstr "" 
    8294 
    83 #: class-lib/RIF_AdminClass.php:152 
     95#: class-lib/RIF_AdminClass.php:158 
    8496msgid "Limit Excerpt:" 
    8597msgstr "" 
    8698 
    87 #: class-lib/RIF_AdminClass.php:158 
     99#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     100msgid "entries" 
     101msgstr "" 
     102 
     103#: class-lib/RIF_AdminClass.php:162 class-lib/RIF_AdminClass.php:174 
     104msgid "entry" 
     105msgstr "" 
     106 
     107#: class-lib/RIF_AdminClass.php:164 
     108#, php-format 
     109msgid "Empty cache (%d %s):" 
     110msgstr "" 
     111 
     112#: class-lib/RIF_AdminClass.php:164 
     113msgid "You can empty the plugin&#39;s cache here, if necessary." 
     114msgstr "" 
     115 
     116#: class-lib/RIF_AdminClass.php:176 
     117#, php-format 
     118msgid "Empty debug log (%d %s):" 
     119msgstr "" 
     120 
     121#: class-lib/RIF_AdminClass.php:176 
     122msgid "You can empty the debug log here, if necessary." 
     123msgstr "" 
     124 
     125#: class-lib/RIF_AdminClass.php:184 
    88126msgid "Change the size of the image and the excerpt here." 
    89127msgstr "" 
    90128 
    91 #: class-lib/RIF_AdminClass.php:164 
     129#: class-lib/RIF_AdminClass.php:190 
    92130msgid "" 
    93131"Give here only the longest side of the image. The smaller side will be " 
     
    95133msgstr "" 
    96134 
    97 #: class-lib/RIF_AdminClass.php:170 
     135#: class-lib/RIF_AdminClass.php:196 
    98136msgid "" 
    99137"Click, to make image size relativ and not static. This might make the feed " 
     
    101139msgstr "" 
    102140 
    103 #: class-lib/RIF_AdminClass.php:176 
     141#: class-lib/RIF_AdminClass.php:202 
    104142msgid "Click, to include the &#34;media:content&#34; tag in the feed." 
    105143msgstr "" 
    106144 
    107 #: class-lib/RIF_AdminClass.php:182 
     145#: class-lib/RIF_AdminClass.php:208 
    108146msgid "Click, to include the &#34;enclosure&#34; tag in the feed." 
    109147msgstr "" 
    110148 
    111 #: class-lib/RIF_AdminClass.php:188 
     149#: class-lib/RIF_AdminClass.php:214 
    112150#, php-format 
    113151msgid "" 
     
    116154msgstr "" 
    117155 
    118 #: class-lib/RIF_AdminClass.php:194 
     156#: class-lib/RIF_AdminClass.php:220 
     157msgid "Click, to not show post content." 
     158msgstr "" 
     159 
     160#: class-lib/RIF_AdminClass.php:226 
    119161msgid "" 
    120162"Click, to limit the post content to a summary if the post doesn&#39;t have " 
     
    122164msgstr "" 
    123165 
    124 #: class-lib/RIF_AdminClass.php:200 
     166#: class-lib/RIF_AdminClass.php:232 
    125167msgid "" 
    126168"How long should the summary of the article be? Enter the number of sentences " 
     
    128170msgstr "" 
    129171 
    130 #: class-lib/RIF_AdminClass.php:216 
     172#: class-lib/RIF_AdminClass.php:261 
    131173msgid "Please enter a numeric value for the image size." 
    132174msgstr "" 
    133175 
    134 #: class-lib/RIF_AdminClass.php:224 
     176#: class-lib/RIF_AdminClass.php:269 
    135177msgid "Please enter a numeric value for the excerpt length." 
    136178msgstr "" 
    137179 
    138 #: class-lib/RIF_AdminClass.php:234 
    139 msgid "Imagesize too large. Please choose a value smaller than 1000." 
    140 msgstr "" 
    141  
    142 #: image-rss.php:145 
     180#: class-lib/RIF_AdminClass.php:279 
     181msgid "Imagesize too large. Please choose a value smaller than 10000." 
     182msgstr "" 
     183 
     184#: class-lib/RIF_AdminClass.php:304 
     185msgid "Cache emptied." 
     186msgstr "" 
     187 
     188#: class-lib/RIF_AdminClass.php:314 
     189msgid "Debug Log emptied." 
     190msgstr "" 
     191 
     192#: image-rss.php:160 
    143193msgid "FAQ" 
    144194msgstr "" 
    145195 
    146 #: image-rss.php:146 
     196#: image-rss.php:161 
    147197msgid "Donate" 
    148198msgstr "" 
    149199 
    150 #: image-rss.php:164 
     200#: image-rss.php:179 
    151201msgid "RSS Image" 
    152202msgstr "" 
  • rss-image-feed/trunk/readme.txt

    r1359722 r1375602  
    55Requires at least: 2.7 
    66Tested up to: 4.5 
    7 Stable tag: 4.2.3 
     7Stable tag: 4.2.4 
    88 
    99The RSS Image Feed adds the first image of a post to your feeds, even in firefox and even if you only display the excerpt. 
     
    3232 
    3333== Changelog == 
     34 
     35= 4.2.4 = 
     36 
     37* made downwards compatible with versions prior to WP 4.4 again 
     38* some minor bugfixes 
    3439 
    3540= 4.2.3 = 
     
    211216 
    212217Added <media:content> tag to the feed as well 
     218 
     219= 4.2.4 = 
     220 
     221Made downwards compatible with versions prior to WP 4.4 again; some minor bugfixes 
Note: See TracChangeset for help on using the changeset viewer.