[Fusionforge-commits] r10436 - in trunk/src/plugins/wiki/www: . lib/plugin pgsrc themes/Wordpress/templates themes/default themes/fusionforge/pgsrc
Marc-Etienne VARGENAU
vargenau at libremir.placard.fr.eu.org
Wed Sep 8 21:09:00 CEST 2010
Author: vargenau
Date: 2010-09-08 21:09:00 +0200 (Wed, 08 Sep 2010)
New Revision: 10436
Added:
trunk/src/plugins/wiki/www/themes/default/flowplayer-3.2.4.swf
trunk/src/plugins/wiki/www/themes/default/flowplayer.controls-3.2.2.swf
Removed:
trunk/src/plugins/wiki/www/themes/default/flowplayer-3.1.4.swf
trunk/src/plugins/wiki/www/themes/default/flowplayer.controls-3.1.4.swf
Modified:
trunk/src/plugins/wiki/www/TODO
trunk/src/plugins/wiki/www/lib/plugin/Video.php
trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple
trunk/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl
trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
Log:
Phpwiki: upgrade Flowplayer + small fixes
Modified: trunk/src/plugins/wiki/www/TODO
===================================================================
--- trunk/src/plugins/wiki/www/TODO 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/TODO 2010-09-08 19:09:00 UTC (rev 10436)
@@ -9,8 +9,10 @@
** no "make clean" in themes
** "make clean" does not work in themes with no Javascript
** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors
-* plugin Video does not work
+* plugin Video does not work (code reverted to r7204 to make it work again)
+----
+
short-term TODO:
* rename should check existing subpages and rename these also.
* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
Modified: trunk/src/plugins/wiki/www/lib/plugin/Video.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/Video.php 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/lib/plugin/Video.php 2010-09-08 19:09:00 UTC (rev 10436)
@@ -1,8 +1,7 @@
<?php // -*-php-*-
-// rcs_id('$Id: Video.php 7639 2010-08-11 12:15:16Z vargenau $');
+// rcs_id('$Id: Video.php 7676 2010-09-08 10:08:16Z vargenau $');
/*
* Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright 2009 Reini Urban
*
* This file is part of PhpWiki.
*
@@ -55,12 +54,11 @@
}
function getDefaultArguments() {
- return array('width' => 460,
- 'height' => 320,
- 'url' => '',
- 'file' => '',
- 'autoplay' => 'false',
- 'image' => ''
+ return array('width' => 460,
+ 'height' => 320,
+ 'url' => '',
+ 'file' => '',
+ 'autoplay' => 'false'
);
}
@@ -75,33 +73,72 @@
} elseif ($url && $file) {
return $this->error(_("Choose only one of 'url' or 'file' parameters."));
} elseif ($file) {
- $url = getUploadDataPath() . $file;
+ // $url = SERVER_URL . getUploadDataPath() . '/' . $file;
+ $url = getUploadDataPath() . '/' . $file;
}
- // TODO: Check HTML5 browser capabilities
if (string_ends_with($url, ".ogg")) {
return HTML::video(array('autoplay' => 'true', 'controls' => 'true', 'src' => $url),
_("Your browser does not understand the HTML 5 video tag."));
}
- if (!$image) $image = $url;
- if ($autoplay != 'true' and $autoplay != 'false')
- return $this->error(fmt("Invalid argument %s", "autoplay"));
- if (!is_numeric($width))
- return $this->error(fmt("Invalid argument %s", "width"));
- if (!is_numeric($height))
- return $this->error(fmt("Invalid argument %s", "height"));
- if (preg_match("/'/", $url))
- return $this->error(fmt("Invalid argument %s", "url"));
- $params = array("data" => SERVER_URL . $WikiTheme->_findData('flowplayer-3.1.4.swf'),
- "type" => "application/x-shockwave-flash",
- "width" => $width,
- "height" => $height,
- "allowfullscreen" => "true",
- "allowscriptaccess" => "false",
- "flashvars"=>
- "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}'");
- return ImgObject(HTML::img(array('src' => $image)), $params);
+ $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;
}
};
Modified: trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%FSetAclSimple
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-09-08 19:09:00 UTC (rev 10436)
@@ -1,6 +1,6 @@
-Date: Tue, 31 Aug 2010 11:36:04 +0000
+Date: Wed, 8 Sep 2010 12:16:55 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7654 2010-08-31 09:41:22Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7677 2010-09-08 10:19:29Z vargenau $
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration%2FSetAclSimple;
flags=PAGE_LOCKED;
@@ -8,21 +8,17 @@
charset=UTF-8
Content-Transfer-Encoding: binary
+{| style="width: 100%; background-color: #e9fbff; border-style: solid; border-color: blue; border-width: 2px;"
+|-
+| {{(on)}} **//Liberal Access Rights//** means **//Everyone can edit//**.
+|-
+| {{(on)}} **//Restrictive Access Rights//** means **//Only logged users can see the page//**.
+|}
+
For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
----
-//Liberal Access Rights// means //Everyone can edit//.
-
-view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
-
-
-//Restrictive Access Rights// means //Only logged users can see the page//.
-
-view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
-
-----
-
<<WikiAdminSetAclSimple>>
----
Modified: trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/pgsrc/SetGlobalAccessRightsSimple 2010-09-08 19:09:00 UTC (rev 10436)
@@ -1,6 +1,6 @@
-Date: Tue, 31 Aug 2010 11:36:04 +0000
+Date: Wed, 8 Sep 2010 12:16:55 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7655 2010-08-31 11:37:18Z vargenau $
+X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7677 2010-09-08 10:19:29Z vargenau $
Content-Type: application/x-phpwiki;
pagename=SetGlobalAccessRightsSimple;
flags=PAGE_LOCKED;
@@ -11,17 +11,15 @@
This action page will allow you to set the default access rights for wiki pages.
Pages without individual access rights will use these default access rights.
+{| style="width: 100%; background-color: #e9fbff; border-style: solid; border-color: blue; border-width: 2px;"
+|-
+| {{(on)}} **//Liberal Access Rights//** means **//Everyone can edit//**.
+|-
+| {{(on)}} **//Restrictive Access Rights//** means **//Only logged users can see the page//**.
+|}
+
----
-//Liberal Access Rights// means //Everyone can edit//.
-
-view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
-
-
-//Restrictive Access Rights// means //Only logged users can see the page//.
-
-view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
-
<<WikiAdminSetAclSimple s=. info=pagename>>
----
Modified: trunk/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl 2010-09-08 19:09:00 UTC (rev 10436)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: editpage.tmpl 7678 2010-09-08 11:17:03Z vargenau $');
/*
* FIXME: Hack!
* The funky URL used for the form action parameter is bogus.
@@ -21,7 +21,7 @@
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
<?php if (!$IS_CURRENT) { ?>
- <p><strong><?php echo _("Warning: You are editing an old revision.")?>
+ <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
<?php echo _("Saving this page will overwrite the current version.")?></strong></p>
<?php } ?>
</td>
Deleted: trunk/src/plugins/wiki/www/themes/default/flowplayer-3.1.4.swf
===================================================================
(Binary files differ)
Copied: trunk/src/plugins/wiki/www/themes/default/flowplayer-3.2.4.swf (from rev 10435, trunk/src/plugins/wiki/www/themes/default/flowplayer-3.1.4.swf)
===================================================================
(Binary files differ)
Deleted: trunk/src/plugins/wiki/www/themes/default/flowplayer.controls-3.1.4.swf
===================================================================
(Binary files differ)
Copied: trunk/src/plugins/wiki/www/themes/default/flowplayer.controls-3.2.2.swf (from rev 10435, trunk/src/plugins/wiki/www/themes/default/flowplayer.controls-3.1.4.swf)
===================================================================
(Binary files differ)
Modified: trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%FSetAclSimple
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-09-08 19:09:00 UTC (rev 10436)
@@ -1,6 +1,6 @@
-Date: Tue, 31 Aug 2010 11:36:17 +0000
+Date: Wed, 8 Sep 2010 12:17:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7656 2010-08-31 11:42:09Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7677 2010-09-08 10:19:29Z vargenau $
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration%2FSetAclSimple;
flags=PAGE_LOCKED;
@@ -8,21 +8,17 @@
charset=UTF-8
Content-Transfer-Encoding: binary
+{| style="width: 100%; background-color: #e9fbff; border-style: solid; border-color: blue; border-width: 2px;"
+|-
+| {{(on)}} **//Liberal Access Rights//** means **//Everyone can edit//**, even if not member of the project.
+|-
+| {{(on)}} **//Restrictive Access Rights//** means **//Only project members can see the page//**.
+|}
+
For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
----
-//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
-
-view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
-
-
-//Restrictive Access Rights// means //Only project members can see the page//.
-
-view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
-
-----
-
<<WikiAdminSetAclSimple>>
----
Modified: trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple 2010-09-08 18:23:16 UTC (rev 10435)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple 2010-09-08 19:09:00 UTC (rev 10436)
@@ -1,6 +1,6 @@
-Date: Tue, 31 Aug 2010 11:36:04 +0000
+Date: Wed, 8 Sep 2010 12:17:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7657 2010-08-31 12:07:02Z vargenau $
+X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7677 2010-09-08 10:19:29Z vargenau $
Content-Type: application/x-phpwiki;
pagename=SetGlobalAccessRightsSimple;
flags=PAGE_LOCKED;
@@ -11,17 +11,15 @@
This action page will allow you to set the default access rights for wiki pages.
Pages without individual access rights will use these default access rights.
+{| style="width: 100%; background-color: #e9fbff; border-style: solid; border-color: blue; border-width: 2px;"
+|-
+| {{(on)}} **//Liberal Access Rights//** means **//Everyone can edit//**, even if not member of the project.
+|-
+| {{(on)}} **//Restrictive Access Rights//** means **//Only project members can see the page//**.
+|}
+
----
-//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
-
-view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
-
-
-//Restrictive Access Rights// means //Only project members can see the page//.
-
-view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
-
<<WikiAdminSetAclSimple s=. info=pagename>>
----
More information about the Fusionforge-commits
mailing list