From: <var...@us...> - 2020-12-28 18:58:10
|
Revision: 10209 http://sourceforge.net/p/phpwiki/code/10209 Author: vargenau Date: 2020-12-28 18:58:08 +0000 (Mon, 28 Dec 2020) Log Message: ----------- Flash is dead Modified Paths: -------------- trunk/TODO trunk/config/config-default.ini trunk/config/config-dist.ini trunk/configurator.php trunk/lib/WikiDB/backend.php trunk/lib/WikiPluginCached.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/Video.php trunk/lib/stdlib.php trunk/locale/Makefile trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/pgsrc/Help%2FCalendarListPlugin trunk/pgsrc/Help%2FImages trunk/pgsrc/Help%2FPloticusPlugin trunk/pgsrc/Help%2FTeX2pngPlugin trunk/pgsrc/Help%2FVideoPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/PhpWikiManual trunk/pgsrc/ReleaseNotes trunk/themes/blog/templates/top.tmpl Removed Paths: ------------- trunk/pgsrc/Help%2FAdobe%20Flash trunk/themes/Sidebar/clock.php trunk/themes/Sidebar/ora.swf trunk/themes/default/flowplayer-3.2.4.swf trunk/themes/default/flowplayer.controls-3.2.2.swf Modified: trunk/TODO =================================================================== --- trunk/TODO 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/TODO 2020-12-28 18:58:08 UTC (rev 10209) @@ -84,7 +84,7 @@ * display login page on "$action is disallowed on this wiki for user ..." * remove "Invalid username" warning on "sign in as" button click * themes/blog, BlogArchivesPlugin -* test WikiPluginCached support for image maps and svg, swf, eps, ... +* test WikiPluginCached support for image maps and svg, eps, ... defer header logic * don't print php notices and warnings as red errors. just green or grey Modified: trunk/config/config-default.ini =================================================================== --- trunk/config/config-default.ini 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/config/config-default.ini 2020-12-28 18:58:08 UTC (rev 10209) @@ -130,7 +130,7 @@ DEFAULT_WIKI_PAGES = "ReleaseNotes" ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher" -INLINE_IMAGES = "png|jpg|jpeg|gif|swf" +INLINE_IMAGES = "png|jpg|jpeg|gif" WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])" INTERWIKI_MAP_FILE = lib/interwiki.map WARN_NONPUBLIC_INTERWIKIMAP = false Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/config/config-dist.ini 2020-12-28 18:58:08 UTC (rev 10209) @@ -932,11 +932,11 @@ ; URLs ending with the following extension should be inlined as images. ; Specify as per ALLOWED_PROTOCOLS. -; Note that you can now also allow class|svg|svgz|vrml|swf ..., +; Note that you can now also allow class|svg|svgz|vrml..., ; which will create embedded object instead of img. ; Typical CGI extensions as pl or cgi maybe allowed too, ; but those two will be enforced to img. -;INLINE_IMAGES = "png|jpg|jpeg|gif|swf" +;INLINE_IMAGES = "png|jpg|jpeg|gif" ; Perl regexp for WikiNames ("bumpy words"): ; (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/configurator.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -1330,7 +1330,7 @@ within a named link [name|uri] one more protocol is defined: phpwiki"); $properties["Inline Images"] = - new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif|swf'); + new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif'); $properties["WikiName Regexp"] = new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", " Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/WikiDB/backend.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -566,7 +566,7 @@ } return array($from, $limit); } else { - if (!empty($limit) && !is_numeric($limit)) { + if (!empty($limit) && (!is_numeric($limit) || $limit > 2147483647)) { trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma")); return array(0, 0); } Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/WikiPluginCached.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -37,7 +37,6 @@ define('PLUGIN_CACHED_MAP', 2); // area maps define('PLUGIN_CACHED_SVG', 3); // special SVG/SVGZ object define('PLUGIN_CACHED_SVG_PNG', 4); // special SVG/SVGZ object with PNG fallback -define('PLUGIN_CACHED_SWF', 5); // special SWF (flash) object define('PLUGIN_CACHED_PDF', 6); // special PDF object (inlinable?) define('PLUGIN_CACHED_PS', 7); // special PS object (inlinable?) // boolean tests: @@ -441,7 +440,7 @@ } /** - * svg?, swf, ... + * svg?, ... <object type="audio/x-wav" standby="Loading Audio" data="example.wav"> <param name="src" value="example.wav" valuetype="data"></param> <param name="autostart" value="false" valuetype="data"></param> @@ -524,7 +523,7 @@ } $supportedtypes = array(); - // Todo: swf, pdf, ... + // Todo: pdf, ... $imagetypes = array( 'png' => IMG_PNG, 'gif' => IMG_GIF, @@ -591,7 +590,7 @@ 'gd2' => 'Content-type: image/gd2', 'wbmp' => 'Content-type: image/vnd.wap.wbmp', // wireless bitmaps for PDA's and such. 'html' => 'Content-type: text/html'); - // Todo: swf, pdf, svg, svgz + // Todo: pdf, svg, svgz header($IMAGEHEADER[$doctype]); } Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/plugin/GraphViz.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -30,7 +30,7 @@ * * Note: * - We support only images supported by GD so far (PNG most likely). - * EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested. + * EPS, PS, SVG or SVGZ and imagemaps need to be tested. * * TODO: * - neato binary ? @@ -97,13 +97,11 @@ $device = strtolower($this->_args['imgtype']); if (in_array($device, $this->mapTypes())) return PLUGIN_CACHED_MAP; - if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps'))) { + if (in_array($device, array('svg', 'svgz', 'eps', 'ps'))) { switch ($this->_args['imgtype']) { case 'svg': case 'svgz': return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG; - case 'swf': - return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF; default: return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML; } Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/plugin/Ploticus.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -24,7 +24,7 @@ /** * The Ploticus plugin passes all its arguments to the ploticus - * binary and displays the result as PNG, GIF, EPS, SVG or SWF. + * binary and displays the result as PNG, GIF, EPS or SVG. * Ploticus is a free, GPL, non-interactive software package * for producing plots, charts, and graphics from data. * See http://ploticus.sourceforge.net/doc/welcome.html @@ -35,7 +35,7 @@ * - For windows you need either a gd library with GIF support or * a Ploticus with PNG support. This comes e.g. with the Cygwin build. * - We support only images supported by GD so far (PNG most likely). - * No EPS, PS, SWF, SVG or SVGZ support yet, due to limitations in WikiPluginCached. + * No EPS, PS, SVG or SVGZ support yet, due to limitations in WikiPluginCached. * This will be fixed soon. * * Usage: @@ -83,13 +83,11 @@ if ($type == $this->_args['device']) return PLUGIN_CACHED_IMG_INLINE; $device = strtolower($this->_args['device']); - if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps', 'pdf', 'html'))) { + if (in_array($device, array('svg', 'svgz', 'eps', 'ps', 'pdf', 'html'))) { switch ($this->_args['device']) { case 'svg': case 'svgz': return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG; - case 'swf': - return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF; default: return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML; } @@ -218,7 +216,7 @@ { // Check device $device = strtolower($argarray['device']); - if (!in_array($device, array('gif', 'png', 'jpeg', 'svg', 'svgz', 'eps', 'swf', 'ps', 'pdf', 'html'))) { + if (!in_array($device, array('gif', 'png', 'jpeg', 'svg', 'svgz', 'eps', 'ps', 'pdf', 'html'))) { $this->_errortext = _("wrong device"); return false; } Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/plugin/UpLoad.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -67,7 +67,7 @@ function run($dbi, $argstr, &$request, $basepage) { $this->allowed_extensions = explode(",", - "7z,avi,bmp,bz2,c,cfg,diff,doc,docx,flv,gif,h,ics,ini,". + "7z,avi,bmp,bz2,c,cfg,diff,doc,docx,gif,h,ics,ini,". "jpeg,jpg,kmz,mp3,odg,odp,ods,odt,ogg,patch,pdf,png,ppt,". "pptx,rar,svg,tar,tar.gz,txt,xls,xlsx,xml,xsd,zip"); $this->disallowed_extensions = explode(",", Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/plugin/Video.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -49,7 +49,7 @@ { function getDescription() { - return _("Display video in Flash or HTML5."); + return _("Display video in HTML5."); } function getDefaultArguments() @@ -102,63 +102,6 @@ } return $video; } - - $html = HTML(); - - if (isBrowserIE()) { - $object = HTML::object(array('id' => 'flowplayer', - 'classid' => 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', - 'width' => $width, - 'height' => $height)); - - $param = HTML::param(array('name' => 'movie', - 'value' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'))); - $object->pushContent($param); - - $param = HTML::param(array('name' => "allowfullscreen", - 'value' => "true")); - $object->pushContent($param); - - $param = HTML::param(array('name' => "allowscriptaccess", - 'value' => "false")); - $object->pushContent($param); - - $flashvars = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}"; - - $param = HTML::param(array('name' => 'flashvars', - 'value' => $flashvars)); - $object->pushContent($param); - - $embed = HTML::embed(array('type' => 'application/x-shockwave-flash', - 'width' => $width, - 'height' => $height, - 'src' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'), - 'flashvars' => $flashvars)); - $object->pushContent($embed); - - $html->pushContent($object); - - } else { - $object = HTML::object(array('data' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'), - 'type' => "application/x-shockwave-flash", - 'width' => $width, - 'height' => $height)); - - $param = HTML::param(array('name' => "allowfullscreen", - 'value' => "true")); - $object->pushContent($param); - - $param = HTML::param(array('name' => "allowscriptaccess", - 'value' => "false")); - $object->pushContent($param); - - $value = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}"; - $param = HTML::param(array('name' => "flashvars", - 'value' => $value)); - $object->pushContent($param); - - $html->pushContent($object); - } - return $html; + return HTML(); } } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/lib/stdlib.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -272,7 +272,7 @@ // display apache style icon for file type instead of protocol icon // - archive: unix:gz,bz2,tgz,tar,z; mac:dmg,dmgz,bin,img,cpt,sit; pc:zip; // - document: html, htm, text, txt, rtf, pdf, doc - // - non-inlined image: jpg,jpeg,png,gif,tiff,tif,swf,pict,psd,eps,ps + // - non-inlined image: jpg,jpeg,png,gif,tiff,tif,pict,psd,eps,ps // - audio: mp3,mp2,aiff,aif,au // - multimedia: mpeg,mpg,mov,qt } else { @@ -403,7 +403,7 @@ * Disallows sizes which are too small. * Spammers may use such (typically invisible) image attributes to raise their GoogleRank. * - * Handle embeddable objects, like svg, class, vrml, swf, svgz, pdf, avi, wmv especially. + * Handle embeddable objects, like svg, class, vrml, svgz, pdf, avi, wmv especially. */ function LinkImage($url, $alt = "") { @@ -2080,7 +2080,7 @@ /** * Returns true if the filename ends with an image suffix. - * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif|swf" + * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif" */ function is_image($filename) { @@ -2088,7 +2088,7 @@ if (defined('INLINE_IMAGES')) { $inline_images = INLINE_IMAGES; } else { - $inline_images = "png|jpg|jpeg|gif|swf"; + $inline_images = "png|jpg|jpeg|gif"; } foreach (explode("|", $inline_images) as $suffix) { @@ -2101,13 +2101,12 @@ /** * Returns true if the filename ends with an video suffix. - * Currently FLV, OGG, MP4 and WebM. + * Currently OGG, MP4 and WebM. */ function is_video($filename) { - return string_ends_with(strtolower($filename), ".flv") - or string_ends_with(strtolower($filename), ".ogg") + return string_ends_with(strtolower($filename), ".ogg") or string_ends_with(strtolower($filename), ".mp4") or string_ends_with(strtolower($filename), ".webm"); } Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/Makefile 2020-12-28 18:58:08 UTC (rev 10209) @@ -773,7 +773,6 @@ ${POT_FILE}: .././themes/shamino_com/templates/signin.tmpl ${POT_FILE}: .././themes/shamino_com/templates/top.tmpl ${POT_FILE}: .././themes/shamino_com/themeinfo.php -${POT_FILE}: .././themes/Sidebar/clock.php ${POT_FILE}: .././themes/Sidebar/hyperapplet.php ${POT_FILE}: .././themes/Sidebar/hyperwiki.php ${POT_FILE}: .././themes/Sidebar/templates/actionbar.tmpl Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/pgsrc/NoteDiRilascio =================================================================== --- trunk/locale/it/pgsrc/NoteDiRilascio 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/it/pgsrc/NoteDiRilascio 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Thu, 16 Dec 2020 12:01:56 +0000 +Date: Mon, 28 Dec 2020 19:46:14 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=NoteDiRilascio; @@ -13,14 +13,17 @@ Major release: * PHP 7 compatible * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles. +* Flash is dead === Changes === * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table * Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported * Pear: use ##mysqli## instead of ##mysql## -* Update Pear DB library to 1.9.3 +* Update PEAR.php to release 1.10.12 +* Update Pear DB library to 1.10.0 +* Update Pear Cache library to 1.5.6 * Replace ##ereg## functions -* Update Adodb to version 5.20.14 +* Update Adodb to version 5.20.19 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com) * Update highlight.js to version 9.15.6 * Allow Wikicreole syntax for plugins in theme templates @@ -31,7 +34,6 @@ * Updated pgsrc pages in all languages * Security fixes * Adding SPDX-License-Identifier in PHP source files -* More documentation translation === Bugs === * Make function IsSafeURL more strict Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/de.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -3359,7 +3359,7 @@ msgid "Rate" msgstr "Bewerte" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" # (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!) Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/es.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -3263,7 +3263,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/fr.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -3334,8 +3334,8 @@ msgid "Rate" msgstr "Évaluer" -msgid "Display video in Flash or HTML5." -msgstr "Afficher une vidéo en Flash ou HTML5." +msgid "Display video in HTML5." +msgstr "Afficher une vidéo en HTML5." msgid "Both 'url' or 'file' parameters missing." msgstr "Les paramètres « url » et « file » manquent tous les deux." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/it.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -3240,7 +3240,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/ja.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3226,7 +3226,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/nl.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -3232,7 +3232,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/phpwiki.pot 2020-12-28 18:58:08 UTC (rev 10209) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3226,7 +3226,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/sv.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -3227,7 +3227,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/locale/po/zh.po 2020-12-28 18:58:08 UTC (rev 10209) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-15 17:58+0100\n" +"POT-Creation-Date: 2020-12-28 19:06+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -3239,7 +3239,7 @@ msgid "Rate" msgstr "" -msgid "Display video in Flash or HTML5." +msgid "Display video in HTML5." msgstr "" msgid "Both 'url' or 'file' parameters missing." Deleted: trunk/pgsrc/Help%2FAdobe%20Flash =================================================================== --- trunk/pgsrc/Help%2FAdobe%20Flash 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FAdobe%20Flash 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,76 +0,0 @@ -Date: Thu, 13 Oct 2016 15:09:28 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) -Content-Type: application/x-phpwiki; - pagename=Help%2FAdobe%20Flash; - flags=PAGE_LOCKED%2CEXTERNAL_PAGE; - charset=UTF-8 -Content-Transfer-Encoding: binary - -You can easily insert **Adobe Flash** (.swf) files in the wiki. - -== Uploading Flash files == - -First, Flash files need to be uploaded in the wiki. For that purpose, you will use the -[[Help:UpLoadPlugin|UpLoad]] plugin. - -=== Syntax === - -You give access to the uploaded Flash files with the following syntax. - -{{{ -{{myflash.swf}} -}}} -or -{{{ -[[Upload:myflash.swf]] -}}} -will inline the image. - -=== Options === - -Using the {{{Upload:}}} syntax, options are allowed to change the appearance: -{{{ -[[Upload:myflash.png size=40x25 align=center]] -}}} - -Separate options by spaces. The allowed options are the following: -* size: //width "x" height// or //num + "%"// -* align: //string// -* border: //number// -* hspace: //number// -* vspace: //number// - -== Examples == - -=== Wikicreole syntax === - -{{{ -{{ora.swf}} -}}} - -{{/themes/Sidebar/ora.swf}} - -=== Upload syntax === - -{{{ -[[Upload:ora.swf]] -[[Upload:ora.swf size=50x50]] -}}} - -=== URL syntax === - -{{{ -[[http://www.freemahjong.org/mahjong.swf size=1000x600]] -}}} - -[[http://www.freemahjong.org/mahjong.swf size=1000x600]] - -== See Also == -* [[Help:Images]] -* [[Help:VideoPlugin]] -* [[Help:Wikicreole]] - -<noinclude> ----- -[[PhpWikiDocumentation]] -</noinclude> Modified: trunk/pgsrc/Help%2FCalendarListPlugin =================================================================== --- trunk/pgsrc/Help%2FCalendarListPlugin 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FCalendarListPlugin 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Sun, 29 Mar 2020 22:43:23 +0000 +Date: Sun, 29 Mar 2020 18:53:38 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FCalendarListPlugin; Modified: trunk/pgsrc/Help%2FImages =================================================================== --- trunk/pgsrc/Help%2FImages 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FImages 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Sun, 27 Dec 2020 16:52:02 +0000 +Date: Mon, 28 Dec 2020 19:46:14 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FImages; @@ -103,7 +103,6 @@ [[http://phpwiki.demo.free.fr/themes/default/images/poweredby_phpwiki_51x31.png]] == See Also == -* [[Help:Adobe Flash]] * [[Help:VideoPlugin]] * [[Help:Wikicreole]] Modified: trunk/pgsrc/Help%2FPloticusPlugin =================================================================== --- trunk/pgsrc/Help%2FPloticusPlugin 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FPloticusPlugin 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Thu, 13 Oct 2016 15:09:28 +0000 +Date: Mon, 28 Dec 2020 19:46:14 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FPloticusPlugin; @@ -7,7 +7,7 @@ Content-Transfer-Encoding: binary The **Ploticus** [[Help:WikiPlugin|plugin]] passes all its arguments to the Ploticus -binary and displays the result as PNG, GIF, EPS, SVG, SVGZ or SWF. +binary and displays the result as PNG, GIF, EPS, SVG or SVGZ. Ploticus is a free, GPL, non-interactive software package for producing plots, charts, and graphics from data. See http://ploticus.sourceforge.net/doc/welcome.html @@ -45,7 +45,7 @@ ! Default value |- | **device** -| gif, png, jpeg, svg, svgz, eps, swf. Any -T parameter supported by Ploticus. +| gif, png, jpeg, svg, svgz, eps. Any -T parameter supported by Ploticus. | png |- | **data** Modified: trunk/pgsrc/Help%2FTeX2pngPlugin =================================================================== --- trunk/pgsrc/Help%2FTeX2pngPlugin 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FTeX2pngPlugin 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Sun, 29 Mar 2020 22:43:23 +0000 +Date: Thu, 13 Oct 2016 15:09:28 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FTeX2pngPlugin; Modified: trunk/pgsrc/Help%2FVideoPlugin =================================================================== --- trunk/pgsrc/Help%2FVideoPlugin 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FVideoPlugin 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Thu, 13 Oct 2016 15:09:28 +0000 +Date: Mon, 28 Dec 2020 19:46:14 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FVideoPlugin; @@ -7,12 +7,12 @@ Content-Transfer-Encoding: binary The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page. -Video file must be encoded in FLV format ([[WikiPedia:Flash Video|Flash Video]]) or in an HTML 5 format: +Video file must be an HTML 5 format: * [[WikiPedia:Ogg|Ogg]] (##.ogg## suffix), * [[WikiPedia:MP4|MP4]] (##.mp4## suffix), * [[WikiPedia:WebM|WebM]] (##.webm## suffix). -The Video plugin can also be called with the ~{~{video.flv~}~} syntax. +The Video plugin can also be called with the ~{~{video.ogg~}~} syntax. == Arguments == @@ -49,17 +49,17 @@ A video: {{{ -<<Video url=http://a.video.server/a_video.flv>> +<<Video url=http://a.video.server/a_video.ogg>> }}} Another video: {{{ -<<Video file=another_video.flv>> +<<Video file=another_video.ogg>> }}} This is equivalent to: {{{ -{{another_video.flv}} +{{another_video.ogg}} }}} === Big Buck Bunny === @@ -76,7 +76,6 @@ == See Also == * [[Help:Images]] -* [[Help:Adobe Flash]] * [[Help:Wikicreole]] * [[http://tools.google.com/dlpage/webmmf/|WebM Video for Internet Explorer 9+]] Modified: trunk/pgsrc/Help%2FWikiPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiPlugin 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/Help%2FWikiPlugin 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Sun, 29 Mar 2020 22:43:23 +0000 +Date: Sun, 29 Mar 2020 19:52:27 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPlugin; Modified: trunk/pgsrc/PhpWikiManual =================================================================== --- trunk/pgsrc/PhpWikiManual 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/PhpWikiManual 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Thu, 13 Oct 2016 15:09:28 +0000 +Date: Mon, 28 Dec 2020 19:46:14 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=PhpWikiManual; @@ -18,7 +18,6 @@ <<IncludePage page="Help/HowToUseWiki">> <<IncludePage page="FindPage">> <<IncludePage page="Help/Images">> -<<IncludePage page="Help/Adobe Flash">> <<IncludePage page="Help/Categories">> <<IncludePage page="Help/InterWiki">> <<IncludePage page="Help/LinkIcons">> Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/pgsrc/ReleaseNotes 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,4 +1,4 @@ -Date: Sat, 26 Dec 2020 16:56:04 +0000 +Date: Mon, 28 Dec 2020 19:46:14 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -13,12 +13,15 @@ Major release: * PHP 7 compatible * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles. +* Flash is dead === Changes === * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table * Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported * Pear: use ##mysqli## instead of ##mysql## +* Update PEAR.php to release 1.10.12 * Update Pear DB library to 1.10.0 +* Update Pear Cache library to 1.5.6 * Replace ##ereg## functions * Update Adodb to version 5.20.19 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com) Deleted: trunk/themes/Sidebar/clock.php =================================================================== --- trunk/themes/Sidebar/clock.php 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/themes/Sidebar/clock.php 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,34 +0,0 @@ -<?php -/** - * Copyright © 2004 Reini Urban - * - * This file is part of PhpWiki. - * - * PhpWiki is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * PhpWiki is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with PhpWiki; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * SPDX-License-Identifier: GPL-2.0-or-later - * - */ - -$ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf"; -?> -<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" - codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0" width="160" - height="160" align="middle"> - <param name="movie" value="<?php echo $ora ?>"> - <param name="quality" value="high"> - <embed src="<?php echo $ora ?>" quality="high" type="application/x-shockwave-flash" width="160" - height="160"></embed> -</object> Deleted: trunk/themes/Sidebar/ora.swf =================================================================== --- trunk/themes/Sidebar/ora.swf 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/themes/Sidebar/ora.swf 2020-12-28 18:58:08 UTC (rev 10209) @@ -1,6 +0,0 @@ -FWS\xB6-V\xB9P\xA1-\ No newline at end of file Modified: trunk/themes/blog/templates/top.tmpl =================================================================== --- trunk/themes/blog/templates/top.tmpl 2020-12-27 15:54:58 UTC (rev 10208) +++ trunk/themes/blog/templates/top.tmpl 2020-12-28 18:58:08 UTC (rev 10209) @@ -2,7 +2,7 @@ <div id="header"> <?php if ( $request->getArg('action') == 'browse' ) { ?> <div id="yoursiteheader"> -<?php // Insert Flash or Logo here ?> +<?php // Insert Logo here ?> <a href=""><?php echo WIKI_NAME ?></a> </div> <?php } ?> Deleted: trunk/themes/default/flowplayer-3.2.4.swf =================================================================== (Binary files differ) Deleted: trunk/themes/default/flowplayer.controls-3.2.2.swf =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |