Only decode from utf8 if we aren't running under utf8.

(anyway we need a setting to decide the original encoding
and to be perfect)

diff --git a/auth/db/lib.php b/auth/db/lib.php
index 7ca12c83cd106fa20a9c49c4175d168b2cd28edf..d7f301e0178f218cc722913847ad7c0fb6c0c384 100644 (file)
--- a/auth/db/lib.php
+++ b/auth/db/lib.php
@@ -104,7 +104,11 @@ function auth_get_userinfo($username){
             if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." FROM $CFG->auth_dbtable
                                         WHERE $CFG->auth_dbfielduser = '$username'")) {
                 if ( $rs->RecordCount() == 1 ) {
-                    $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                    if (!empty($CFG->unicodedb)) {
+                        $result["$field"] = addslashes(stripslashes($rs->fields[0]));
+                    } else {
+                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                    }
                 }
             }
         }
@@ -403,4 +407,4 @@ function auth_db_update_user_record($username, $updatekeys=false) {
     return get_record_select("user", "username = '$username' AND deleted <> '1'");
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 96df846aaf27150b495f87bfd6a68c36c7cb0263..f70fa313871d8cfd803fe35491efe394f3f8a129 100644 (file)
--- a/auth/ldap/lib.php
+++ b/auth/ldap/lib.php
@@ -127,10 +127,18 @@ function auth_get_userinfo($username){
             $ldapval = NULL;
             foreach ($values as $value) {
                 if(is_array($user_entry[0][strtolower($value)])) {
-                    $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)][0])));
+                    if (!empty($CFG->unicodedb)) {
+                        $newval = addslashes(stripslashes($user_entry[0][strtolower($value)][0]));
+                    } else {
+                        $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)][0])));
+                    }
                 }
                 else {
-                    $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)])));
+                    if (!empty($CFG->unicodedb)) {
+                        $newval = addslashes(stripslashes($user_entry[0][strtolower($value)]));
+                    } else {
+                        $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)])));
+                    }
                 }
                 if (!empty($newval)) { // favour ldap entries that are set
                     $ldapval = $newval;

diff --git a/auth/shibboleth/lib.php b/auth/shibboleth/lib.php
index 862e10415c88e73d2a322dbe1746300767f89830..45c5e8f02cb40fef9a0026b85c6d7a2f8f7b2fcd 100755 (executable)
--- a/auth/shibboleth/lib.php
+++ b/auth/shibboleth/lib.php
@@ -44,7 +44,11 @@ function auth_get_userinfo($username) {
     $search_attribs = array();
   
     foreach ($attrmap as $key=>$value) {
-        $result[$key]=utf8_decode($_SERVER[$value]);
+        if (!empty($CFG->unicodedb)) {
+            $result[$key]=$_SERVER[$value];
+        } else {
+            $result[$key]=utf8_decode($_SERVER[$value]);
+        }
     }
 
      // Provide an API to modify the information to fit the Moodle internal