From 3e46c6ec5a6776991976f11d66ac07e4d6dd7009 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Mon, 7 Aug 2006 14:53:53 +0000
Subject: [PATCH] Swf now disabled by default in Mediaplugin and added
 explanation SC#284; merged from MOODLE_16_STABLE

---
 filter/mediaplugin/defaultsettings.php |  2 +-
 filter/mediaplugin/filterconfig.html   | 10 ++++++++++
 lang/en_utf8/admin.php                 |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/filter/mediaplugin/defaultsettings.php b/filter/mediaplugin/defaultsettings.php
index c51d287feb..4f4d4db4b2 100644
--- a/filter/mediaplugin/defaultsettings.php
+++ b/filter/mediaplugin/defaultsettings.php
@@ -21,7 +21,7 @@
             set_config( 'filter_mediaplugin_ignore_swf','' );
         }
         else {
-            set_config( 'filter_mediaplugin_enable_swf', 1 );
+            set_config( 'filter_mediaplugin_enable_swf', 0 ); //disable swf embedding by default for now
         }
     }
     if (!isset($CFG->filter_mediaplugin_enable_mov) or $forcereset) {
diff --git a/filter/mediaplugin/filterconfig.html b/filter/mediaplugin/filterconfig.html
index 17d990471f..3b3d938734 100644
--- a/filter/mediaplugin/filterconfig.html
+++ b/filter/mediaplugin/filterconfig.html
@@ -6,6 +6,7 @@
     $txt = new Object;
     $txt->mediapluginmp3 = get_string( 'mediapluginmp3','admin' );
     $txt->mediapluginswf = get_string( 'mediapluginswf','admin' );
+    $txt->mediapluginswfnote = get_string( 'mediapluginswfnote','admin' );
     $txt->mediapluginmov = get_string( 'mediapluginmov','admin' );
     $txt->mediapluginwmv = get_string( 'mediapluginwmv','admin' );
     $txt->mediapluginmpg = get_string( 'mediapluginmpg','admin' );
@@ -25,41 +26,49 @@
         <td align="right"><?php echo $txt->mediapluginmp3 ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_mp3',
              $CFG->filter_mediaplugin_enable_mp3 ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginswf?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_swf',
              $CFG->filter_mediaplugin_enable_swf ); ?></td> 
+        <td><?php echo $txt->mediapluginswfnote ?></td>
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginmov ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_mov',
              $CFG->filter_mediaplugin_enable_mov ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginwmv ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_wmv',
              $CFG->filter_mediaplugin_enable_wmv ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginmpg ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_mpg',
              $CFG->filter_mediaplugin_enable_mpg ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginavi ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_avi',
              $CFG->filter_mediaplugin_enable_avi ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginflv ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_flv',
              $CFG->filter_mediaplugin_enable_flv ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginram ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_ram',
              $CFG->filter_mediaplugin_enable_ram ); ?></td> 
+        <td />
     </tr>
     <tr valign="top">
         <td align="right"><?php echo $txt->mediapluginrpm ?></td>
@@ -70,5 +79,6 @@
         <td align="right"><?php echo $txt->mediapluginrm ?></td>
         <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_rm',
              $CFG->filter_mediaplugin_enable_rm ); ?></td> 
+        <td />
     </tr>
 </table>
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 9d541e9167..80fc3afee2 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -191,6 +191,7 @@ $string['mediapluginmov'] = 'Enable .mov filter';
 $string['mediapluginmp3'] = 'Enable .mp3 filter';
 $string['mediapluginmpg'] = 'Enable .mpg filter';
 $string['mediapluginswf'] = 'Enable .swf filter';
+$string['mediapluginswfnote'] = 'As a default security measure, normal users should not allowed to embed swf flash files.';
 $string['mediapluginram'] = 'Enable .ram filter';
 $string['mediapluginrm']  = 'Enable .rm filter';
 $string['mediapluginrpm'] = 'Enable .rpm filter';
-- 
2.39.5