[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/wiki-kde-org/develop] extensions/OpenID: Dump sync data as array
From: Sayak Banerjee <sayakb () kde ! org>
Date: 2013-08-25 0:34:58
Message-ID: E1VDOIE-0005Gz-H8 () scm ! kde ! org
[Download RAW message or body]
Git commit 2a222d134150cf08f870b58b6c9d24eefbbc2a84 by Sayak Banerjee.
Committed on 25/08/2013 at 00:34.
Pushed by sayakb into branch 'develop'.
Dump sync data as array
M +13 -13 extensions/OpenID/SpecialOpenID.body.php
http://commits.kde.org/websites/wiki-kde-org/2a222d134150cf08f870b58b6c9d24eefbbc2a84
diff --git a/extensions/OpenID/SpecialOpenID.body.php b/extensions/OpenID/SpecialOpenID.body.php
index 657f7f9..8c3c921 100755
--- a/extensions/OpenID/SpecialOpenID.body.php
+++ b/extensions/OpenID/SpecialOpenID.body.php
@@ -179,7 +179,7 @@ class SpecialOpenID extends SpecialPage {
function login( $openid_url, $finish_page ) {
global $wgTrustRoot, $wgOut, $wgRequest;
-
+
// Was KDE Identity used?
if ( $wgRequest->getText( 'ldap_password_identity' ) ) {
$this->identityLogin();
@@ -264,7 +264,7 @@ class SpecialOpenID extends SpecialPage {
// Create AX fetch request and add attributes
$ax_request = new Auth_OpenID_AX_FetchRequest;
-
+
foreach($attribute as $attr){
$ax_request->add($attr);
}
@@ -303,7 +303,7 @@ class SpecialOpenID extends SpecialPage {
wfRestoreWarnings();
}
-
+
function identityLogin() {
global $wgIdentity, $wgRequest, $wgOut, $wgCookiePrefix, $wgAuth, $wgUser;
wfSuppressWarnings();
@@ -316,7 +316,7 @@ class SpecialOpenID extends SpecialPage {
// Connection successful
if ( $ldapConn ) {
$ldapBind = ldap_bind($ldapConn, $wgIdentity['userDN'], $wgIdentity['userPass']);
-
+
// Admin login failed
if ( !$ldapBind ) {
$wgOut->showErrorPage( 'openiderror', 'identity-proxy-error' );
@@ -398,9 +398,9 @@ class SpecialOpenID extends SpecialPage {
$sreg['language'] = $wgRequest->getCookie( 'identityLanguage' );
$nameArry = explode( ' ', $sreg['fullname'] );
- $ax['http://axschema.org/namePerson/first'] = $nameArry[0];
- $ax['http://axschema.org/namePerson/last'] = $nameArry[1];
- $ax['http://axschema.org/contact/email'] = $sreg['email'];
+ $ax['http://axschema.org/namePerson/first'][0] = $nameArry[0];
+ $ax['http://axschema.org/namePerson/last'][0] = $nameArry[1];
+ $ax['http://axschema.org/contact/email'][0] = $sreg['email'];
$openid = 'identity/' . $sreg['username'];
@@ -412,7 +412,7 @@ class SpecialOpenID extends SpecialPage {
function identityRegister() {
global $wgRequest, $wgUser, $wgOut;
-
+
// Check if create user form was submitted
if ( $wgRequest->getCheck( 'wpOK' ) ) {
$choice = $wgRequest->getText( 'wpNameChoice' );
@@ -437,9 +437,9 @@ class SpecialOpenID extends SpecialPage {
$sreg['language'] = $wgRequest->getCookie( 'identityLanguage' );
$nameArry = explode( ' ', $sreg['fullname'] );
- $ax['http://axschema.org/namePerson/first'] = $nameArry[0];
- $ax['http://axschema.org/namePerson/last'] = $nameArry[1];
- $ax['http://axschema.org/contact/email'] = $sreg['email'];
+ $ax['http://axschema.org/namePerson/first'][0] = $nameArry[0];
+ $ax['http://axschema.org/namePerson/last'][0] = $nameArry[1];
+ $ax['http://axschema.org/contact/email'][0] = $sreg['email'];
$openid = 'identity/' . $sreg['username'];
@@ -496,7 +496,7 @@ class SpecialOpenID extends SpecialPage {
function identityConvertCheck() {
global $wgRequest;
-
+
if ( $wgRequest->getText( 'ldap_password_identity' ) ) {
$this->identityLogin();
return true;
@@ -592,7 +592,7 @@ class SpecialOpenID extends SpecialPage {
function identityCheckHash( $user ) {
global $wgRequest, $wgOut;
-
+
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
array( 'user_openid_hash' ),
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic