diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 9e387137f..71f0e51f9 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -1993,7 +1993,70 @@ class e_parse extends e_parser } + function toASCII($text) + { + $forn[] = utf8_encode("Ç"); $chg[] = "C"; + + $forn[] = utf8_encode("È"); $chg[] = "E"; + $forn[] = utf8_encode("É"); $chg[] = "E"; + $forn[] = utf8_encode("Ê"); $chg[] = "E"; + $forn[] = utf8_encode("Ë"); $chg[] = "E"; + + $forn[] = utf8_encode("Ó"); $chg[] = "O"; + $forn[] = utf8_encode("Ô"); $chg[] = "O"; + $forn[] = utf8_encode("Õ"); $chg[] = "O"; + $forn[] = utf8_encode("Ö"); $chg[] = "O"; + + $forn[] = utf8_encode("Ù"); $chg[] = "U"; + $forn[] = utf8_encode("Ú"); $chg[] = "U"; + $forn[] = utf8_encode("Û"); $chg[] = "U"; + $forn[] = utf8_encode("Ü"); $chg[] = "U"; + + $forn[] = utf8_encode("Í"); $chg[] = "I"; + $forn[] = utf8_encode("Á"); $chg[] = "A"; + $forn[] = utf8_encode("Ñ"); $chg[] = "N"; + + + $forn[] = utf8_encode("â"); $chg[] = "a"; + $forn[] = utf8_encode("ã"); $chg[] = "a"; + $forn[] = utf8_encode("ä"); $chg[] = "a"; + $forn[] = utf8_encode("å"); $chg[] = "a"; + $forn[] = utf8_encode("à"); $chg[] = "a"; + $forn[] = utf8_encode("á"); $chg[] = "a"; + + $forn[] = utf8_encode("ç"); $chg[] = "c"; + + $forn[] = utf8_encode("è"); $chg[] = "e"; + $forn[] = utf8_encode("é"); $chg[] = "e"; + $forn[] = utf8_encode("ê"); $chg[] = "e"; + $forn[] = utf8_encode("ë"); $chg[] = "e"; + + $forn[] = utf8_encode("ì"); $chg[] = "i"; + $forn[] = utf8_encode("í"); $chg[] = "i"; + $forn[] = utf8_encode("î"); $chg[] = "i"; + $forn[] = utf8_encode("ï"); $chg[] = "i"; + $forn[] = utf8_encode("î"); $chg[] = "i"; + + $forn[] = utf8_encode("ñ"); $chg[] = "n"; + + $forn[] = utf8_encode("ð"); $chg[] = "o"; + $forn[] = utf8_encode("ò"); $chg[] = "o"; + $forn[] = utf8_encode("ó"); $chg[] = "o"; + $forn[] = utf8_encode("ô"); $chg[] = "o"; + $forn[] = utf8_encode("õ"); $chg[] = "o"; + $forn[] = utf8_encode("ö"); $chg[] = "o"; + + $forn[] = utf8_encode("ü"); $chg[] = "u"; + $forn[] = utf8_encode("ú"); $chg[] = "u"; + $forn[] = utf8_encode("ù"); $chg[] = "u"; + $forn[] = utf8_encode("û"); $chg[] = "u"; + + $text = str_replace($forn,$chg,$text); + + return $text; + + } diff --git a/e107_handlers/hybridauth/Hybrid/Auth.php b/e107_handlers/hybridauth/Hybrid/Auth.php index 9e094e5f3..77daae7a5 100644 --- a/e107_handlers/hybridauth/Hybrid/Auth.php +++ b/e107_handlers/hybridauth/Hybrid/Auth.php @@ -15,7 +15,7 @@ */ class Hybrid_Auth { - public static $version = "2.8.0"; + public static $version = "2.8.1"; /** * Configuration array diff --git a/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php b/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php index 30db81d74..f96a500b1 100644 --- a/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php +++ b/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php @@ -239,14 +239,7 @@ class Hybrid_Provider_Adapter { throw new Exception("Call to undefined function Hybrid_Providers_{$this->id}::$name()."); } - $counter = count($arguments); - if ($counter == 1) { - return $this->adapter->$name($arguments[0]); - } elseif ($counter == 2) { - return $this->adapter->$name($arguments[0], $arguments[1]); - } else { - return $this->adapter->$name(); - } + return call_user_func_array(array($this->adapter, $name), $arguments); } /** diff --git a/e107_handlers/hybridauth/index.php b/e107_handlers/hybridauth/index.php index 10b79c150..dceac4698 100644 --- a/e107_handlers/hybridauth/index.php +++ b/e107_handlers/hybridauth/index.php @@ -8,7 +8,7 @@ // ------------------------------------------------------------------------ // HybridAuth End Point // ------------------------------------------------------------------------ -require_once("../../class2.php"); + require_once( "Hybrid/Auth.php" ); require_once( "Hybrid/Endpoint.php" ); diff --git a/e107_handlers/hybridauth/live.php b/e107_handlers/hybridauth/live.php new file mode 100644 index 000000000..e992784b7 --- /dev/null +++ b/e107_handlers/hybridauth/live.php @@ -0,0 +1,13 @@ +