|iU', $html, $matches);
+ if (isset($matches[1])) {
+ preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
+ return $content[1];
+ }
+ return FALSE;
}
/**
@@ -211,201 +205,200 @@ function _openid_meta_httpequiv($equiv, $html) {
* 'openid.' appended)
*/
function _openid_signature($association, $message_array, $keys_to_sign) {
- $signature = '';
- $sign_data = array();
+ $signature = '';
+ $sign_data = array();
- foreach ($keys_to_sign as $key) {
- if (isset($message_array['openid.'. $key])) {
- $sign_data[$key] = $message_array['openid.'. $key];
+ foreach ($keys_to_sign as $key) {
+ if (isset($message_array['openid.' . $key])) {
+ $sign_data[$key] = $message_array['openid.' . $key];
+ }
}
- }
- $message = _openid_create_message($sign_data);
- $secret = base64_decode($association->mac_key);
- $signature = _openid_hmac($secret, $message);
+ $message = _openid_create_message($sign_data);
+ $secret = base64_decode($association->mac_key);
+ $signature = _openid_hmac($secret, $message);
- return base64_encode($signature);
+ return base64_encode($signature);
}
function _openid_hmac($key, $text) {
- if (strlen($key) > OPENID_SHA1_BLOCKSIZE) {
- $key = _openid_sha1($key, true);
- }
+ if (strlen($key) > OPENID_SHA1_BLOCKSIZE) {
+ $key = _openid_sha1($key, true);
+ }
- $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
- $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
- $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
- $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
- $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+ $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
+ $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
+ $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
+ $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
+ $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
- return $hmac;
+ return $hmac;
}
function _openid_sha1($text) {
- $hex = sha1($text);
- $raw = '';
- for ($i = 0; $i < 40; $i += 2) {
- $hexcode = substr($hex, $i, 2);
- $charcode = (int)base_convert($hexcode, 16, 10);
- $raw .= chr($charcode);
- }
- return $raw;
+ $hex = sha1($text);
+ $raw = '';
+ for ($i = 0; $i < 40; $i += 2) {
+ $hexcode = substr($hex, $i, 2);
+ $charcode = (int) base_convert($hexcode, 16, 10);
+ $raw .= chr($charcode);
+ }
+ return $raw;
}
function _openid_dh_base64_to_long($str) {
- $b64 = base64_decode($str);
+ $b64 = base64_decode($str);
- return _openid_dh_binary_to_long($b64);
+ return _openid_dh_binary_to_long($b64);
}
function _openid_dh_long_to_base64($str) {
- return base64_encode(_openid_dh_long_to_binary($str));
+ return base64_encode(_openid_dh_long_to_binary($str));
}
function _openid_dh_binary_to_long($str) {
- $bytes = array_merge(unpack('C*', $str));
+ $bytes = array_merge(unpack('C*', $str));
- $n = 0;
- foreach ($bytes as $byte) {
- $n = bcmul($n, pow(2, 8));
- $n = bcadd($n, $byte);
- }
+ $n = 0;
+ foreach ($bytes as $byte) {
+ $n = bcmul($n, pow(2, 8));
+ $n = bcadd($n, $byte);
+ }
- return $n;
+ return $n;
}
function _openid_dh_long_to_binary($long) {
- $cmp = bccomp($long, 0);
- if ($cmp < 0) {
- return FALSE;
- }
+ $cmp = bccomp($long, 0);
+ if ($cmp < 0) {
+ return FALSE;
+ }
- if ($cmp == 0) {
- return "\x00";
- }
+ if ($cmp == 0) {
+ return "\x00";
+ }
- $bytes = array();
+ $bytes = array();
- while (bccomp($long, 0) > 0) {
- array_unshift($bytes, bcmod($long, 256));
- $long = bcdiv($long, pow(2, 8));
- }
+ while (bccomp($long, 0) > 0) {
+ array_unshift($bytes, bcmod($long, 256));
+ $long = bcdiv($long, pow(2, 8));
+ }
- if ($bytes && ($bytes[0] > 127)) {
- array_unshift($bytes, 0);
- }
+ if ($bytes && ($bytes[0] > 127)) {
+ array_unshift($bytes, 0);
+ }
- $string = '';
- foreach ($bytes as $byte) {
- $string .= pack('C', $byte);
- }
+ $string = '';
+ foreach ($bytes as $byte) {
+ $string .= pack('C', $byte);
+ }
- return $string;
+ return $string;
}
function _openid_dh_xorsecret($shared, $secret) {
- $dh_shared_str = _openid_dh_long_to_binary($shared);
- $sha1_dh_shared = _openid_sha1($dh_shared_str);
- $xsecret = "";
- for ($i = 0; $i < strlen($secret); $i++) {
- $xsecret .= chr(ord($secret[$i]) ^ ord($sha1_dh_shared[$i]));
- }
-
- return $xsecret;
+ $dh_shared_str = _openid_dh_long_to_binary($shared);
+ $sha1_dh_shared = _openid_sha1($dh_shared_str);
+ $xsecret = "";
+ for ($i = 0; $i < strlen($secret); $i++) {
+ $xsecret .= chr(ord($secret[$i]) ^ ord($sha1_dh_shared[$i]));
+ }
+
+ return $xsecret;
}
function _openid_dh_rand($stop) {
- static $duplicate_cache = array();
+ static $duplicate_cache = array();
- // Used as the key for the duplicate cache
- $rbytes = _openid_dh_long_to_binary($stop);
+ // Used as the key for the duplicate cache
+ $rbytes = _openid_dh_long_to_binary($stop);
- if (array_key_exists($rbytes, $duplicate_cache)) {
- list($duplicate, $nbytes) = $duplicate_cache[$rbytes];
- }
- else {
- if ($rbytes[0] == "\x00") {
- $nbytes = strlen($rbytes) - 1;
- }
- else {
- $nbytes = strlen($rbytes);
- }
+ if (array_key_exists($rbytes, $duplicate_cache)) {
+ list($duplicate, $nbytes) = $duplicate_cache[$rbytes];
+ } else {
+ if ($rbytes[0] == "\x00") {
+ $nbytes = strlen($rbytes) - 1;
+ } else {
+ $nbytes = strlen($rbytes);
+ }
- $mxrand = bcpow(256, $nbytes);
+ $mxrand = bcpow(256, $nbytes);
- // If we get a number less than this, then it is in the
- // duplicated range.
- $duplicate = bcmod($mxrand, $stop);
+ // If we get a number less than this, then it is in the
+ // duplicated range.
+ $duplicate = bcmod($mxrand, $stop);
- if (count($duplicate_cache) > 10) {
- $duplicate_cache = array();
- }
+ if (count($duplicate_cache) > 10) {
+ $duplicate_cache = array();
+ }
- $duplicate_cache[$rbytes] = array($duplicate, $nbytes);
- }
+ $duplicate_cache[$rbytes] = array($duplicate, $nbytes);
+ }
- do {
- $bytes = "\x00" . _openid_get_bytes($nbytes);
- $n = _openid_dh_binary_to_long($bytes);
- // Keep looping if this value is in the low duplicated range.
- } while (bccomp($n, $duplicate) < 0);
+ do {
+ $bytes = "\x00" . _openid_get_bytes($nbytes);
+ $n = _openid_dh_binary_to_long($bytes);
+ // Keep looping if this value is in the low duplicated range.
+ } while (bccomp($n, $duplicate) < 0);
- return bcmod($n, $stop);
+ return bcmod($n, $stop);
}
function _openid_get_bytes($num_bytes) {
- static $f = null;
- $bytes = '';
- if (!isset($f)) {
- $f = @fopen(OPENID_RAND_SOURCE, "r");
- }
- if (!$f) {
- // pseudorandom used
+ static $f = null;
$bytes = '';
- for ($i = 0; $i < $num_bytes; $i += 4) {
- $bytes .= pack('L', mt_rand());
+ if (!isset($f)) {
+ $f = @fopen(OPENID_RAND_SOURCE, "r");
+ }
+ if (!$f) {
+ // pseudorandom used
+ $bytes = '';
+ for ($i = 0; $i < $num_bytes; $i += 4) {
+ $bytes .= pack('L', mt_rand());
+ }
+ $bytes = substr($bytes, 0, $num_bytes);
+ } else {
+ $bytes = fread($f, $num_bytes);
}
- $bytes = substr($bytes, 0, $num_bytes);
- }
- else {
- $bytes = fread($f, $num_bytes);
- }
- return $bytes;
+ return $bytes;
}
/**
* Fix PHP's habit of replacing '.' by '_' in posted data.
*/
function _openid_fix_post(&$post) {
- //$extensions = module_invoke_all('openid', 'extension');
- foreach ($post as $key => $value) {
- if (strpos($key, 'openid_') === 0) {
- $fixed_key = str_replace('openid_', 'openid.', $key);
- $fixed_key = str_replace('openid.ns_', 'openid.ns.', $fixed_key);
- $fixed_key = str_replace('openid.sreg_', 'openid.sreg.', $fixed_key);
- //foreach ($extensions as $ext) {
- // $fixed_key = str_replace('openid.'.$ext.'_', 'openid.'.$ext.'.', $fixed_key);
- //}
- unset($post[$key]);
- $post[$fixed_key] = $value;
+ //$extensions = module_invoke_all('openid', 'extension');
+ foreach ($post as $key => $value) {
+ if (strpos($key, 'openid_') === 0) {
+ $fixed_key = str_replace('openid_', 'openid.', $key);
+ $fixed_key = str_replace('openid.ns_', 'openid.ns.', $fixed_key);
+ $fixed_key = str_replace('openid.sreg_', 'openid.sreg.', $fixed_key);
+ //foreach ($extensions as $ext) {
+ // $fixed_key = str_replace('openid.'.$ext.'_', 'openid.'.$ext.'.', $fixed_key);
+ //}
+ unset($post[$key]);
+ $post[$fixed_key] = $value;
+ }
}
- }
}
/**
* Provide bcpowmod support for PHP4.
*/
if (!function_exists('bcpowmod')) {
- function bcpowmod($base, $exp, $mod) {
- $square = bcmod($base, $mod);
- $result = 1;
- while (bccomp($exp, 0) > 0) {
- if (bcmod($exp, 2)) {
- $result = bcmod(bcmul($result, $square), $mod);
- }
- $square = bcmod(bcmul($square, $square), $mod);
- $exp = bcdiv($exp, 2);
+
+ function bcpowmod($base, $exp, $mod) {
+ $square = bcmod($base, $mod);
+ $result = 1;
+ while (bccomp($exp, 0) > 0) {
+ if (bcmod($exp, 2)) {
+ $result = bcmod(bcmul($result, $square), $mod);
+ }
+ $square = bcmod(bcmul($square, $square), $mod);
+ $exp = bcdiv($exp, 2);
+ }
+ return $result;
}
- return $result;
- }
+
}
diff --git a/main/auth/openid/whatis.php b/main/auth/openid/whatis.php
old mode 100755
new mode 100644
index 70c2e3a826..6c275689a2
--- a/main/auth/openid/whatis.php
+++ b/main/auth/openid/whatis.php
@@ -7,21 +7,8 @@
/**
* Code
*/
-require('../../inc/global.inc.php');
+require_once '../../inc/global.inc.php';
Display::display_header('OpenID', NULL);
-?>
-
-
-
-
-
-
-Return to the previous page
-
-
+echo Display::page_header(get_lang('OpenIDWhatIs'));
+echo get_lang('OpenIDDescription');
+Display::display_footer();
\ No newline at end of file
diff --git a/main/css/base.css b/main/css/base.css
index e435a61fec..4e87a50f68 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -3161,6 +3161,10 @@ form .formw .freeze {
text-align: left;
}
+.form_login {
+ padding: 3px 15px;
+}
+
#formLogin label {
color:#666666;
}
@@ -3262,7 +3266,7 @@ div#no-data-view div.controls {
-/* styles for the star rater */
+/* styles for the star rater */
.star-rating{
list-style:none;
margin: 0px;
@@ -4666,5 +4670,4 @@ i.size-32.icon-new-work{
#filepaths input{
margin-bottom:5px;
-}
-
+}
\ No newline at end of file
diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php
index ddb4d9f367..5343ba5e4b 100644
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@@ -686,7 +686,8 @@ class Database {
if (strpos($query, 'c_')) {
//Check if the table contains inner joins
if (
-
+
+ strpos($query, 'assoc_handle') === false &&
strpos($query, 'olpc_peru_filter') === false &&
strpos($query, 'allow_public_certificates') === false &&
strpos($query, 'DROP TABLE IF EXISTS') === false &&
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 6578bc3687..7436b923ad 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -469,13 +469,13 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
}//end logout ... else ... login
} elseif (api_get_setting('openid_authentication')=='true') {
if (!empty($_POST['openid_url'])) {
- include 'main/auth/openid/login.php';
- openid_begin(trim($_POST['openid_url']),api_get_path(WEB_PATH).'index.php');
+ include api_get_path(SYS_CODE_PATH).'auth/openid/login.php';
+ openid_begin(trim($_POST['openid_url']), api_get_path(WEB_PATH).'index.php');
//this last function should trigger a redirect, so we can die here safely
die('Openid login redirection should be in progress');
} elseif (!empty($_GET['openid_identity'])) {
//it's usual for PHP to replace '.' (dot) by '_' (underscore) in URL parameters
- include('main/auth/openid/login.php');
+ include(api_get_path(SYS_CODE_PATH).'auth/openid/login.php');
$res = openid_complete($_GET);
if ($res['status'] == 'success') {
$id1 = Database::escape_string($res['openid.identity']);