blacklist option ENABLE_FLASH_PLAYER

diff --git a/functions.php b/functions.php
index 27efb2c48b20d1486f571090c62e08f72810f0dd..d874ba3b9c91c762cd10f2bd86e3e86512c326f3 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4454,35 +4454,14 @@
 
                $entry = "";
 
 
                $entry = "";
 

-               if (($ctype == __("audio/mpeg")) &&  (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {  
+               if ($ctype == "audio/mpeg") {  

                      
                        $entry .= "<object type=\"application/x-shockwave-flash\" 
                                data=\"extras/button/musicplayer.swf?song_url=$url\" 
                      
                        $entry .= "<object type=\"application/x-shockwave-flash\" 
                                data=\"extras/button/musicplayer.swf?song_url=$url\" 

-                               width=\"17\" height=\"17\" style='float : left'> 
+                               width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'> 

                                        <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object>";  
                }
 
                                        <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object>";  
                }
 

-               /*
-
-               if (substr($ctype,0,6)=="audio/" || $ctype=="application/ogg" || $ctype=="application/x-ogg") {
-                       $entry .= "<audio controls=\"controls\"><source src=\"$url\" type=\"$ctype\" />";
-                       if (($ctype == __("audio/mpeg")) && 
-                               (get_pref($link, "ENABLE_FLASH_PLAYER")) ) { 
-                               $entry .= "<span><object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"17\" height=\"17\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object></span>";
-                       }
-                       $entry .= "</audio> ";
-                       if (($ctype == __("audio/mpeg")) && 
-                               (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
-                               $entry .= "<a id='switchToFlashLink' href='#' onclick='return switchToFlash(this)'>".__('Switch to Flash Player')."</a>";       
-                               $entry .= "<script type='text/javascript'>html5AudioOrFlash('$ctype');</script>"; 
-                       }
-               } elseif (substr($ctype,0,6)=="video/") {
-                       $entry .= "<video controls=\"controls\"><source src=\"$url\" type=\"$ctype\" />";
-                       $entry .= "</video>";
-               } */
-
-
-

                return $entry;
        }
 
                return $entry;
        }
 

diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 359359733315095245b6cf540316f4782ee20ace..879ef6fc79150dad0b1d0364b197ef1d7e0909a9 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -16,7 +16,7 @@
                $prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
                        "ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS", 
                        "ENABLE_OFFLINE_READING", "EXTENDED_FEEDLIST", "FEEDS_SORT_BY_UNREAD",
                $prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
                        "ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS", 
                        "ENABLE_OFFLINE_READING", "EXTENDED_FEEDLIST", "FEEDS_SORT_BY_UNREAD",

-                       "OPEN_LINKS_IN_NEW_WINDOW", "USER_STYLESHEET_URL");
+                       "OPEN_LINKS_IN_NEW_WINDOW", "USER_STYLESHEET_URL", "ENABLE_FLASH_PLAYER");

 
                $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", 
                        "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", 
 
                $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", 
                        "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",