WordPress.org
Get WordPress

Plugin Directory

Changeset 1069434


Ignore:
Timestamp:
01/16/2015 02:39:32 PM (11 years ago)
Author:
EdHynan
Message:

2.2.2: bugfix release: malformed URL could lead to PHP errors

Location:
swfput
Files:
2 deleted
18 edited
1 copied

Legend:

Unmodified
Added
Removed

  • swfput/tags/2.2.2/Makefile

    r970797 r1069434  
    22# License: GNU GPLv3 (see http://www.gnu.org/licenses/gpl-3.0.html)
    33
    4 PRJVERS = 2.2.1
     4PRJVERS = 2.2.2
    55PRJSTEM = swfput
    66PRJNAME = $(PRJSTEM)-$(PRJVERS)
    … …  
    4646MINGC = obj.css
    4747SSRCS = $(SDIRI)/$(MINGS) $(SDIRI)/$(MINGA) $(SDIRI)/$(MINGC)
     48SDEFS = default.mp4
    4849SBINS = $(SDIRI)/$(MNAME).swf
    49 SDEFS = $(SDIRI)/default.flv
    5050
    5151ALSO = Makefile COPYING version.sh
    5252#READS= README README.tty README.tt8 README.pdf README.html
    5353READS= README README.pdf README.html
    54 ZALL = ${SRCS} ${ALSO} ${READS} readme.txt
     54ZALL = ${SRCS} ${ALSO} ${READS} ${SDEFS} readme.txt
    5555ZSALL = ${SSRCS} #${SBINS}
    5656ZDIR = $(H5DIR) $(SDIRI) $(JSDIR) $(LCDIR) $(DOCSD)

  • swfput/tags/2.2.2/README.html

    r970797 r1069434  
    11<!-- Creator     : groff version 1.22.2 -->
    2 <!-- CreationDate: Sat Aug  9 11:18:14 2014 -->
     2<!-- CreationDate: Fri Jan 16 09:29:33 2015 -->
    33<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    44"http://www.w3.org/TR/html4/loose.dtd">

  • swfput/tags/2.2.2/locale/swfput_l10n-en_US.po

    r970797 r1069434  
    1 # swfput 2.2.1 Pot Source
     1# swfput 2.2.2 Pot Source
    22# Copyright (C) 2013 Ed Hynan
    33# This file is distributed under the same license as the swfput package.
    … …  
    77msgid ""
    88msgstr ""
    9 "Project-Id-Version: swfput 2.2.1\n"
     9"Project-Id-Version: swfput 2.2.2\n"
    1010"Report-Msgid-Bugs-To: edhynan@gmail.com\n"
    11 "POT-Creation-Date: 2014-08-09 09:56-0400\n"
    12 "PO-Revision-Date: 2014-08-09 09:56 EDT\n"
     11"POT-Creation-Date: 2015-01-16 08:51-0500\n"
     12"PO-Revision-Date: 2015-01-16 08:51 EST\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    1414"Language-Team: LANGUAGE <LL@li.org>\n"
    … …  
    196196
    197197#. Label shown on widgets page
    198 #: swfput.php:849 swfput.php:870 swfput.php:3346
     198#: swfput.php:849 swfput.php:870 swfput.php:3345
    199199msgid "SWFPut Video Player"
    200200msgstr "SWFPut Video Player"
    … …  
    622622msgstr " [A/V content \"%s\" disabled] "
    623623
    624 #: swfput.php:2722
     624#: swfput.php:2721
    625625msgid "Video playback is not available"
    626626msgstr "Video playback is not available"
    627627
    628 #: swfput.php:2883
     628#: swfput.php:2882
    629629msgid "Video playback is not available."
    630630msgstr "Video playback is not available."
    … …  
    632632#. TRANSLATORS perl-type regular expression
    633633#. that matches a 'yes'
    634 #: swfput.php:3219
     634#: swfput.php:3218
    635635msgid "/^?y(e((s|ah)!?)?)?$/i"
    636636msgstr "/^?y(e((s|ah)!?)?)?$/i"
    … …  
    638638#. TRANSLATORS perl-type regular expression
    639639#. that matches a 'no'
    640 #: swfput.php:3222
     640#: swfput.php:3221
    641641msgid "/^n(o!?)?)?$/i"
    642642msgstr "/^n(o!?)?)?$/i"
    643643
    644644#. Description shown under label shown on widgets page
    645 #: swfput.php:3348
     645#: swfput.php:3347
    646646msgid "Flash and HTML5 video for your widget areas"
    647647msgstr "Flash and HTML5 video for your widget areas"

  • swfput/tags/2.2.2/locale/swfput_l10n.pot

    r970797 r1069434  
    1 # swfput 2.2.1 Pot Source
     1# swfput 2.2.2 Pot Source
    22# Copyright (C) 2013 Ed Hynan
    33# This file is distributed under the same license as the swfput package.
    … …  
    77msgid ""
    88msgstr ""
    9 "Project-Id-Version: swfput 2.2.1\n"
     9"Project-Id-Version: swfput 2.2.2\n"
    1010"Report-Msgid-Bugs-To: edhynan@gmail.com\n"
    11 "POT-Creation-Date: 2014-08-09 09:56-0400\n"
     11"POT-Creation-Date: 2015-01-16 08:51-0500\n"
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    172172
    173173#. Label shown on widgets page
    174 #: swfput.php:849 swfput.php:870 swfput.php:3346
     174#: swfput.php:849 swfput.php:870 swfput.php:3345
    175175msgid "SWFPut Video Player"
    176176msgstr ""
    … …  
    462462msgstr ""
    463463
    464 #: swfput.php:2722
     464#: swfput.php:2721
    465465msgid "Video playback is not available"
    466466msgstr ""
    467467
    468 #: swfput.php:2883
     468#: swfput.php:2882
    469469msgid "Video playback is not available."
    470470msgstr ""
    … …  
    472472#. TRANSLATORS perl-type regular expression
    473473#. that matches a 'yes'
    474 #: swfput.php:3219
     474#: swfput.php:3218
    475475msgid "/^?y(e((s|ah)!?)?)?$/i"
    476476msgstr ""
    … …  
    478478#. TRANSLATORS perl-type regular expression
    479479#. that matches a 'no'
    480 #: swfput.php:3222
     480#: swfput.php:3221
    481481msgid "/^n(o!?)?)?$/i"
    482482msgstr ""
    483483
    484484#. Description shown under label shown on widgets page
    485 #: swfput.php:3348
     485#: swfput.php:3347
    486486msgid "Flash and HTML5 video for your widget areas"
    487487msgstr ""

  • swfput/tags/2.2.2/readme.txt

    r1047266 r1069434  
    55Requires at least: 3.0.2
    66Tested up to: 4.1
    7 Stable tag: 2.2.1
     7Stable tag: 2.2.2
    88Text Domain: swfput_l10n
    99License: GPLv3 or later
    … …  
    280280
    281281== Changelog ==
     282
     283= 2.2.2 =
     284* Bug fix release in response to a kind user query.
     285    URLs provided for video files are checked before they
     286    are used (good), but elsewhere in code an array key
     287    would be missing if the URL was rejected (bad), possibly
     288    leading to PHP error messages appearing on page.
     289
     290    Now, if a faulty URL is rejected, a default video URL
     291    is used, linking to a small video that says "OOPS [...]"
     292    and which should get the site owners attention (site
     293    visitors should find the default video inoffensive, even
     294    if unexpected).
     295
     296= 2.2.1 =
     297* Confirmed working with WP 4.1.
    282298
    283299= 2.2 =
    … …  
    490506== Upgrade Notice ==
    491507
     508= 2.2.2 =
     509* Bug fix release.
     510
     511= 2.2.1 =
     512* Confirmed working with WP 4.1.
     513
    492514= 2.2 =
    493515* Confirmed working with WP 4.0.

  • swfput/tags/2.2.2/swfput.php

    r970797 r1069434  
    44Plugin URI: http://agalena.nfshost.com/b1/swfput-html5-flash-wordpress-plugin
    55Description: Add Flash and HTML5 video to WordPress posts, pages, and widgets, from arbitrary URI's or media library ID's or files in your media upload directory tree (including uploads not in the WordPress media library).
    6 Version: 2.2.1
     6Version: 2.2.2
    77Author: Ed Hynan
    88Author URI: http://agalena.nfshost.com/b1/
    … …  
    115115   
    116116    // this version
    117     const plugin_version = '2.2.0';
     117    const plugin_version = '2.2.2';
    118118   
    119119    // the widget class name
    … …  
    199199    const swfputcssname = 'obj.css';
    200200    // swfput default video name
    201     const swfputdefvid = 'default.flv';
     201    const swfputdefvid = 'default.mp4';
    202202    // swfput program binary path
    203203    protected $swfputbin;
    … …  
    276276        $t = self::swfputdir . '/' . self::swfputcssname;
    277277        $this->swfputcss = plugins_url($t, $pf);
    278         $t = self::swfputdir . '/' . self::swfputdefvid;
     278        $t = /* self::swfputdir . '/' . */ self::swfputdefvid;
    279279        $this->swfputvid = plugins_url($t, $pf);
    280280        $t = self::settings_jsdir . '/' . self::settings_jsname;
    … …  
    25352535            }
    25362536        }
    2537         if ( $url === '' ) {
    2538             return false;
    2539         }
    25402537       
    25412538        $achk = array(
    … …  
    25732570
    25742571        //$ut = $this->check_expand_video_url($url, $defaulturl);
    2575         $flurl = $ut = $this->check_expand_video_url($url, '');
     2572        $flurl = $ut = $this->check_expand_video_url($url);
    25762573        if ( $ut === false ) {
    25772574            self::errlog('rejected URL: "' . $url . '"');
    2578             return '<!-- SWF embedding declined:  URL displeasing -->';
     2575            $flurl = $ut = $this->check_expand_video_url('');
     2576            //return '<!-- SWF embedding declined:  URL displeasing -->';
    25792577        }
    25802578
    … …  
    26332631        if ( ! $ut ) {
    26342632            self::errlog('rejected URL: "' . $url . '"');
    2635             return '<!-- SWF embedding declined:  URL displeasing -->';
     2633            $ut = $this->get_swf_css_url();
     2634            //return '<!-- SWF embedding declined:  URL displeasing -->';
    26362635        }
    26372636        if ( ! $ut ) {
    … …  
    28332832                // leave off src
    28342833                $src = trim($tv[0]);
    2835                 $ut = $this->check_expand_video_url($src, false);
     2834                $ut = $this->check_expand_video_url($src);
    28362835                if ( ! $ut ) {
    28372836                    self::errlog('rejected HTML video URL: "' . $src . '"');

  • swfput/tags/2.2.2/version.sh

    r970797 r1069434  
    33VMAJOR=2
    44VMINOR=2
    5 RMAJOR=1
     5RMAJOR=2
    66RMINOR=0
    77

  • swfput/trunk/Makefile

    r970797 r1069434  
    22# License: GNU GPLv3 (see http://www.gnu.org/licenses/gpl-3.0.html)
    33
    4 PRJVERS = 2.2.1
     4PRJVERS = 2.2.2
    55PRJSTEM = swfput
    66PRJNAME = $(PRJSTEM)-$(PRJVERS)
    … …  
    4646MINGC = obj.css
    4747SSRCS = $(SDIRI)/$(MINGS) $(SDIRI)/$(MINGA) $(SDIRI)/$(MINGC)
     48SDEFS = default.mp4
    4849SBINS = $(SDIRI)/$(MNAME).swf
    49 SDEFS = $(SDIRI)/default.flv
    5050
    5151ALSO = Makefile COPYING version.sh
    5252#READS= README README.tty README.tt8 README.pdf README.html
    5353READS= README README.pdf README.html
    54 ZALL = ${SRCS} ${ALSO} ${READS} readme.txt
     54ZALL = ${SRCS} ${ALSO} ${READS} ${SDEFS} readme.txt
    5555ZSALL = ${SSRCS} #${SBINS}
    5656ZDIR = $(H5DIR) $(SDIRI) $(JSDIR) $(LCDIR) $(DOCSD)

  • swfput/trunk/README.html

    r970797 r1069434  
    11<!-- Creator     : groff version 1.22.2 -->
    2 <!-- CreationDate: Sat Aug  9 11:18:14 2014 -->
     2<!-- CreationDate: Fri Jan 16 09:29:33 2015 -->
    33<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    44"http://www.w3.org/TR/html4/loose.dtd">

  • swfput/trunk/locale/swfput_l10n-en_US.po

    r970797 r1069434  
    1 # swfput 2.2.1 Pot Source
     1# swfput 2.2.2 Pot Source
    22# Copyright (C) 2013 Ed Hynan
    33# This file is distributed under the same license as the swfput package.
    … …  
    77msgid ""
    88msgstr ""
    9 "Project-Id-Version: swfput 2.2.1\n"
     9"Project-Id-Version: swfput 2.2.2\n"
    1010"Report-Msgid-Bugs-To: edhynan@gmail.com\n"
    11 "POT-Creation-Date: 2014-08-09 09:56-0400\n"
    12 "PO-Revision-Date: 2014-08-09 09:56 EDT\n"
     11"POT-Creation-Date: 2015-01-16 08:51-0500\n"
     12"PO-Revision-Date: 2015-01-16 08:51 EST\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    1414"Language-Team: LANGUAGE <LL@li.org>\n"
    … …  
    196196
    197197#. Label shown on widgets page
    198 #: swfput.php:849 swfput.php:870 swfput.php:3346
     198#: swfput.php:849 swfput.php:870 swfput.php:3345
    199199msgid "SWFPut Video Player"
    200200msgstr "SWFPut Video Player"
    … …  
    622622msgstr " [A/V content \"%s\" disabled] "
    623623
    624 #: swfput.php:2722
     624#: swfput.php:2721
    625625msgid "Video playback is not available"
    626626msgstr "Video playback is not available"
    627627
    628 #: swfput.php:2883
     628#: swfput.php:2882
    629629msgid "Video playback is not available."
    630630msgstr "Video playback is not available."
    … …  
    632632#. TRANSLATORS perl-type regular expression
    633633#. that matches a 'yes'
    634 #: swfput.php:3219
     634#: swfput.php:3218
    635635msgid "/^?y(e((s|ah)!?)?)?$/i"
    636636msgstr "/^?y(e((s|ah)!?)?)?$/i"
    … …  
    638638#. TRANSLATORS perl-type regular expression
    639639#. that matches a 'no'
    640 #: swfput.php:3222
     640#: swfput.php:3221
    641641msgid "/^n(o!?)?)?$/i"
    642642msgstr "/^n(o!?)?)?$/i"
    643643
    644644#. Description shown under label shown on widgets page
    645 #: swfput.php:3348
     645#: swfput.php:3347
    646646msgid "Flash and HTML5 video for your widget areas"
    647647msgstr "Flash and HTML5 video for your widget areas"

  • swfput/trunk/locale/swfput_l10n.pot

    r970797 r1069434  
    1 # swfput 2.2.1 Pot Source
     1# swfput 2.2.2 Pot Source
    22# Copyright (C) 2013 Ed Hynan
    33# This file is distributed under the same license as the swfput package.
    … …  
    77msgid ""
    88msgstr ""
    9 "Project-Id-Version: swfput 2.2.1\n"
     9"Project-Id-Version: swfput 2.2.2\n"
    1010"Report-Msgid-Bugs-To: edhynan@gmail.com\n"
    11 "POT-Creation-Date: 2014-08-09 09:56-0400\n"
     11"POT-Creation-Date: 2015-01-16 08:51-0500\n"
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    172172
    173173#. Label shown on widgets page
    174 #: swfput.php:849 swfput.php:870 swfput.php:3346
     174#: swfput.php:849 swfput.php:870 swfput.php:3345
    175175msgid "SWFPut Video Player"
    176176msgstr ""
    … …  
    462462msgstr ""
    463463
    464 #: swfput.php:2722
     464#: swfput.php:2721
    465465msgid "Video playback is not available"
    466466msgstr ""
    467467
    468 #: swfput.php:2883
     468#: swfput.php:2882
    469469msgid "Video playback is not available."
    470470msgstr ""
    … …  
    472472#. TRANSLATORS perl-type regular expression
    473473#. that matches a 'yes'
    474 #: swfput.php:3219
     474#: swfput.php:3218
    475475msgid "/^?y(e((s|ah)!?)?)?$/i"
    476476msgstr ""
    … …  
    478478#. TRANSLATORS perl-type regular expression
    479479#. that matches a 'no'
    480 #: swfput.php:3222
     480#: swfput.php:3221
    481481msgid "/^n(o!?)?)?$/i"
    482482msgstr ""
    483483
    484484#. Description shown under label shown on widgets page
    485 #: swfput.php:3348
     485#: swfput.php:3347
    486486msgid "Flash and HTML5 video for your widget areas"
    487487msgstr ""

  • swfput/trunk/readme.txt

    r1047266 r1069434  
    55Requires at least: 3.0.2
    66Tested up to: 4.1
    7 Stable tag: 2.2.1
     7Stable tag: 2.2.2
    88Text Domain: swfput_l10n
    99License: GPLv3 or later
    … …  
    280280
    281281== Changelog ==
     282
     283= 2.2.2 =
     284* Bug fix release in response to a kind user query.
     285    URLs provided for video files are checked before they
     286    are used (good), but elsewhere in code an array key
     287    would be missing if the URL was rejected (bad), possibly
     288    leading to PHP error messages appearing on page.
     289
     290    Now, if a faulty URL is rejected, a default video URL
     291    is used, linking to a small video that says "OOPS [...]"
     292    and which should get the site owners attention (site
     293    visitors should find the default video inoffensive, even
     294    if unexpected).
     295
     296= 2.2.1 =
     297* Confirmed working with WP 4.1.
    282298
    283299= 2.2 =
    … …  
    490506== Upgrade Notice ==
    491507
     508= 2.2.2 =
     509* Bug fix release.
     510
     511= 2.2.1 =
     512* Confirmed working with WP 4.1.
     513
    492514= 2.2 =
    493515* Confirmed working with WP 4.0.

  • swfput/trunk/swfput.php

    r970797 r1069434  
    44Plugin URI: http://agalena.nfshost.com/b1/swfput-html5-flash-wordpress-plugin
    55Description: Add Flash and HTML5 video to WordPress posts, pages, and widgets, from arbitrary URI's or media library ID's or files in your media upload directory tree (including uploads not in the WordPress media library).
    6 Version: 2.2.1
     6Version: 2.2.2
    77Author: Ed Hynan
    88Author URI: http://agalena.nfshost.com/b1/
    … …  
    115115   
    116116    // this version
    117     const plugin_version = '2.2.0';
     117    const plugin_version = '2.2.2';
    118118   
    119119    // the widget class name
    … …  
    199199    const swfputcssname = 'obj.css';
    200200    // swfput default video name
    201     const swfputdefvid = 'default.flv';
     201    const swfputdefvid = 'default.mp4';
    202202    // swfput program binary path
    203203    protected $swfputbin;
    … …  
    276276        $t = self::swfputdir . '/' . self::swfputcssname;
    277277        $this->swfputcss = plugins_url($t, $pf);
    278         $t = self::swfputdir . '/' . self::swfputdefvid;
     278        $t = /* self::swfputdir . '/' . */ self::swfputdefvid;
    279279        $this->swfputvid = plugins_url($t, $pf);
    280280        $t = self::settings_jsdir . '/' . self::settings_jsname;
    … …  
    25352535            }
    25362536        }
    2537         if ( $url === '' ) {
    2538             return false;
    2539         }
    25402537       
    25412538        $achk = array(
    … …  
    25732570
    25742571        //$ut = $this->check_expand_video_url($url, $defaulturl);
    2575         $flurl = $ut = $this->check_expand_video_url($url, '');
     2572        $flurl = $ut = $this->check_expand_video_url($url);
    25762573        if ( $ut === false ) {
    25772574            self::errlog('rejected URL: "' . $url . '"');
    2578             return '<!-- SWF embedding declined:  URL displeasing -->';
     2575            $flurl = $ut = $this->check_expand_video_url('');
     2576            //return '<!-- SWF embedding declined:  URL displeasing -->';
    25792577        }
    25802578
    … …  
    26332631        if ( ! $ut ) {
    26342632            self::errlog('rejected URL: "' . $url . '"');
    2635             return '<!-- SWF embedding declined:  URL displeasing -->';
     2633            $ut = $this->get_swf_css_url();
     2634            //return '<!-- SWF embedding declined:  URL displeasing -->';
    26362635        }
    26372636        if ( ! $ut ) {
    … …  
    28332832                // leave off src
    28342833                $src = trim($tv[0]);
    2835                 $ut = $this->check_expand_video_url($src, false);
     2834                $ut = $this->check_expand_video_url($src);
    28362835                if ( ! $ut ) {
    28372836                    self::errlog('rejected HTML video URL: "' . $src . '"');

  • swfput/trunk/version.sh

    r970797 r1069434  
    33VMAJOR=2
    44VMINOR=2
    5 RMAJOR=1
     5RMAJOR=2
    66RMINOR=0
    77
Note: See TracChangeset for help on using the changeset viewer.