Commit 8216dea44bd7ca6586b9bdf200834b4a50e6f0ac

Authored by Evandro Junior
1 parent f402ce47

corrected default proxy value

lib/community_hub_plugin/hub.rb
@@ -6,7 +6,7 @@ class CommunityHubPlugin::Hub < Folder @@ -6,7 +6,7 @@ class CommunityHubPlugin::Hub < Folder
6 @@twitter_thread_started = false #change to hash 6 @@twitter_thread_started = false #change to hash
7 @@facebook_thread_started = false #change to hash 7 @@facebook_thread_started = false #change to hash
8 8
9 - settings_items :proxy_url, :type => :string, :default => 'http://161.148.1.167:312' # Remember to use add the port, if needed! 9 + settings_items :proxy_url, :type => :string, :default => 'http://161.148.1.167:3128' # Remember to use add the port, if needed!
10 settings_items :twitter_enabled, :type => :boolean, :default => false 10 settings_items :twitter_enabled, :type => :boolean, :default => false
11 settings_items :hashtags_twitter, :type => :string, :default => "participa.br,participabr,arenanetmundial,netmundial" 11 settings_items :hashtags_twitter, :type => :string, :default => "participa.br,participabr,arenanetmundial,netmundial"
12 settings_items :facebook_enabled, :type => :boolean, :default => false 12 settings_items :facebook_enabled, :type => :boolean, :default => false
@@ -47,6 +47,7 @@ class CommunityHubPlugin::Hub < Folder @@ -47,6 +47,7 @@ class CommunityHubPlugin::Hub < Folder
47 end 47 end
48 end 48 end
49 49
  50 + #Faraday.new(:proxy => { :uri => 'http://proxy.example.com', :user => 'foo', :password => 'bar' })
50 def self.facebook_service(hub, action) 51 def self.facebook_service(hub, action)
51 author_id = 54 52 author_id = 54
52 if action==:start 53 if action==:start
tweeter_stream/lib/twurl/stream.rb
@@ -20,7 +20,7 @@ module Twurl @@ -20,7 +20,7 @@ module Twurl
20 Twurl.options = Options.new 20 Twurl.options = Options.new
21 Twurl.options.command = 'request' # Not necessary anymore 21 Twurl.options.command = 'request' # Not necessary anymore
22 Twurl.options.data = {"track"=>tags} 22 Twurl.options.data = {"track"=>tags}
23 -# Twurl.options.proxy = 'http://161.148.1.167:312' # Use for production mode at SERPRO 23 +# Twurl.options.proxy = 'http://161.148.1.167:3128' # Use for production mode at SERPRO
24 Twurl.options.proxy = proxy unless proxy.nil? or proxy == '' 24 Twurl.options.proxy = proxy unless proxy.nil? or proxy == ''
25 Twurl.options.trace = false 25 Twurl.options.trace = false
26 Twurl.options.headers = {} 26 Twurl.options.headers = {}
views/cms/community_hub_plugin/_hub.rhtml
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 <br /> 15 <br />
16 <div> 16 <div>
17 - <%= labelled_form_field(_('Proxy URL[:port] leave blank for none (example: http://161.148.1.167:312)'), text_field(:article, :proxy_url, :size => '64', :maxlength => 150)) %> 17 + <%= labelled_form_field(_('Proxy URL[:port] leave blank for none (example: http://161.148.1.167:3128)'), text_field(:article, :proxy_url, :size => '64', :maxlength => 150)) %>
18 </div> 18 </div>
19 <br /> 19 <br />
20 <div> 20 <div>