Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 18:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add flash video onebox as disabled setting by default

Browse Source
This commit is contained in:
James A. Anderson & Jalil Mohammed 2013-07-06 10:42:30 -07:00 committed by James Anderson
parent 34dc6a41d9
commit d51a3cf50f
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/site_setting.rb
View File

@ -169,6 +169,8 @@ class SiteSetting < ActiveRecord::Base
setting(:s3_region, '', enum: 'S3RegionSiteSetting')
setting(:s3_upload_bucket, '')
setting(:enable_flash_video_onebox, false)
setting(:default_trust_level, 0)
setting(:default_invitee_trust_level, 1)

2
config/locales/server.en.yml
View File

@ -566,6 +566,8 @@ en:
s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images"
s3_region: "The Amazon S3 region name that will be used to upload images"
enable_flash_video_onebox: "Enable embedding of swf and flv links in oneboxes (may introduce a security risk, caution advised)"
default_invitee_trust_level: "Default trust level (0-4) for invited users"
default_trust_level: "Default trust level (0-4) for users"

6
lib/oneboxer/flash_video_onebox.rb
View File

@ -6,7 +6,11 @@ module Oneboxer
matcher /^https?:\/\/.*\.(swf|flv)$/
def onebox
"<object width='100%' height='100%'><param name='#{@url}' value='#{@url}'><embed src='#{@url}' width='100%' height='100%'></embed></object>"
if SiteSetting.enable_flash_video_onebox
"<object width='100%' height='100%'><param name='#{@url}' value='#{@url}'><embed src='#{@url}' width='100%' height='100%'></embed></object>"
else
"<a href='#{@url}'>#{@url}</a>"
end
end
end

33
spec/components/oneboxer/flash_video_onebox_spec.rb Normal file
View File

@ -0,0 +1,33 @@
require 'spec_helper'
require 'oneboxer'
require 'oneboxer/flash_video_onebox'
describe Oneboxer::FlashVideoOnebox do
before do
@o = Oneboxer::FlashVideoOnebox.new('http://player.56.com/v_OTMyNTk1MzE.swf')
end
context "when SiteSetting.enable_flash_video_onebox is true" do
before do
SiteSetting.stubs(:enable_flash_video_onebox).returns(true)
end
it "generates a flash video" do
expect(@o.onebox).to match_html(
"<object width='100%' height='100%'><param name='http://player.56.com/v_OTMyNTk1MzE.swf' value='http://player.56.com/v_OTMyNTk1MzE.swf'><embed src='http://player.56.com/v_OTMyNTk1MzE.swf' width='100%' height='100%'></embed></object>"
)
end
end
context "when SiteSetting.enable_flash_video_onebox is false" do
before do
SiteSetting.stubs(:enable_flash_video_onebox).returns(false)
end
it "generates a link" do
expect(@o.onebox).to match_html(
"<a href='http://player.56.com/v_OTMyNTk1MzE.swf'>http://player.56.com/v_OTMyNTk1MzE.swf</a>"
)
end
end
end