Download as
Browse Code »

Commit 873f1d46d2dc8e0da70e66d6cd57341a31b4b285

Authored by Daniela Feitosa
1 parent f6703513
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[ldap plugin] Updated readme 

Also changed method used to guess encoding
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
plugins/ldap/README.md
  Diff comments   View file @873f1d4
@@ -13,6 +13,7 @@ Dependences @@ -13,6 +13,7 @@ Dependences
13 See the Noosfero install file. After install Noosfero, install LDAP dependences: 13 See the Noosfero install file. After install Noosfero, install LDAP dependences:
14 14
15 $ gem install net-ldap -v 0.3.1 15 $ gem install net-ldap -v 0.3.1
  16 +$ sudo apt-get install ruby-magic
16 17
17 Enable Plugin 18 Enable Plugin
18 ------------- 19 -------------
plugins/ldap/lib/ldap_authentication.rb
  Diff comments   View file @873f1d4
@@ -136,7 +136,7 @@ class LdapAuthentication @@ -136,7 +136,7 @@ class LdapAuthentication
136 def self.get_attr(entry, attr_name) 136 def self.get_attr(entry, attr_name)
137 if !attr_name.blank? 137 if !attr_name.blank?
138 val = entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] 138 val = entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
139 - charset = Magic.guess_string_mime(val).match(/charset=([^\s]+)/)[1] 139 + charset = Magic.guess_string_mime_encoding(val)
140 val.encode 'utf-8', charset, invalid: :replace, undef: :replace 140 val.encode 'utf-8', charset, invalid: :replace, undef: :replace
141 end 141 end
142 end 142 end