http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97865
Revision: 97865
Author: reedy
Date: 2011-09-22 22:35:07 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fix more whitespace etc
Modified Paths:
--------------
trunk/extensions/SignupAPI/includes/ApiSignup.php
trunk/extensions/SignupAPI/includes/ApiValidateSignup.php
trunk/extensions/SignupAPI/includes/SignupAPI.hooks.php
trunk/extensions/SignupAPI/includes/SpecialUserSignup.php
trunk/extensions/SignupAPI/includes/verification.js
Modified: trunk/extensions/SignupAPI/includes/ApiSignup.php
===================================================================
--- trunk/extensions/SignupAPI/includes/ApiSignup.php 2011-09-22 22:22:50 UTC
(rev 97864)
+++ trunk/extensions/SignupAPI/includes/ApiSignup.php 2011-09-22 22:35:07 UTC
(rev 97865)
@@ -27,10 +27,10 @@
'wpRetype' => $params['retype'],
'wpEmail' => $params['email'],
'wpDomain' => $params['domain'],
- 'wpReason' =>
$params['realname'],
- 'wpSourceAction' =>
$params['source_action'],
- 'wpSourceNS' =>
$params['source_ns'],
- 'wpSourceArticle' =>
$params['source_article'],
+ 'wpReason' => $params['realname'],
+ 'wpSourceAction' => $params['source_action'],
+ 'wpSourceNS' => $params['source_ns'],
+ 'wpSourceArticle' => $params['source_article'],
'wpRemember' => ''
) );
Modified: trunk/extensions/SignupAPI/includes/ApiValidateSignup.php
===================================================================
--- trunk/extensions/SignupAPI/includes/ApiValidateSignup.php 2011-09-22
22:22:50 UTC (rev 97864)
+++ trunk/extensions/SignupAPI/includes/ApiValidateSignup.php 2011-09-22
22:35:07 UTC (rev 97865)
@@ -25,21 +25,22 @@
case "username":
$mUser = User::newFromName(
$params['inputVal'], 'creatable' );
if ( !is_object( $mUser ) ) {
- $result['result'] = wfMsg(
'signupapi-noname' );
- $result['icon'] =
'MW-Icon-AlertMark.png';
+ $result['result'] = wfMsg(
'signupapi-noname' );
+ $result['icon'] =
'MW-Icon-AlertMark.png';
}
if ( 0 != $mUser->idForName() ) {
- $result['result'] = wfMsg(
'signupapi-userexists' );
- $result['icon'] =
"MW-Icon-NoMark.png";
+ $result['result'] = wfMsg(
'signupapi-userexists' );
+ $result['icon'] = "MW-Icon-NoMark.png";
} else {
- $result['result'] = wfMsg(
'signupapi-ok' );
- $result['icon'] =
"MW-Icon-CheckMark.png";
+ $result['result'] = wfMsg(
'signupapi-ok' );
+ $result['icon'] =
"MW-Icon-CheckMark.png";
}
break;
case "email" :
- if ( $valid = User::isValidEmailAddr(
$params['inputVal'] ) ) {
+ $valid = User::isValidEmailAddr(
$params['inputVal'] );
+ if ( $valid ) {
$result['result']= wfMsg(
'signupapi-ok' );
$result['icon'] =
"MW-Icon-CheckMark.png";
} else {
@@ -70,7 +71,7 @@
public function getAllowedParams() {
return array(
- 'field' => null,
+ 'field' => null,
'inputVal' => null,
'password' => null,
'retype' => null,
Modified: trunk/extensions/SignupAPI/includes/SignupAPI.hooks.php
===================================================================
--- trunk/extensions/SignupAPI/includes/SignupAPI.hooks.php 2011-09-22
22:22:50 UTC (rev 97864)
+++ trunk/extensions/SignupAPI/includes/SignupAPI.hooks.php 2011-09-22
22:35:07 UTC (rev 97865)
@@ -79,7 +79,6 @@
'href' => SkinTemplate::makeSpecialUrl(
'UserSignup',
"$returnto&type=signup&wpSourceAction=$sourceAction&wpSourceNS=$sourceNS&wpSourceArticle=$sourceArticle"
),
'active' => $title->isSpecial( 'Userlogin' ) &&
$is_signup
);
-
if ( substr( $wgServer, 0, 5 ) === 'http:' &&
$wgSecureLogin ) {
$title = SpecialPage::getTitleFor( 'UserSignup'
);
$https_url = preg_replace( '/^http:/',
'https:', $title->getFullURL( "type=signup" ) );
Modified: trunk/extensions/SignupAPI/includes/SpecialUserSignup.php
===================================================================
--- trunk/extensions/SignupAPI/includes/SpecialUserSignup.php 2011-09-22
22:22:50 UTC (rev 97864)
+++ trunk/extensions/SignupAPI/includes/SpecialUserSignup.php 2011-09-22
22:35:07 UTC (rev 97865)
@@ -243,6 +243,8 @@
/**
* @private
+ *
+ * @return User|int If int, it is a returned constant
*/
function addNewAccountInternal() {
global $wgUser;
@@ -905,6 +907,10 @@
}
}
+ /**
+ * @param $tempUser User
+ * @return bool
+ */
private function addToSourceTracking( $tempUser ) {
$sourcetracking_data = array(
'userid' => $tempUser->getId(),
Modified: trunk/extensions/SignupAPI/includes/verification.js
===================================================================
--- trunk/extensions/SignupAPI/includes/verification.js 2011-09-22 22:22:50 UTC
(rev 97864)
+++ trunk/extensions/SignupAPI/includes/verification.js 2011-09-22 22:35:07 UTC
(rev 97865)
@@ -1,63 +1,61 @@
//setup verification fields on the form
function validateInput( fieldtype,fieldid ) {
- var inputVal = document.getElementById(fieldid).value;
- var valresult = document.getElementById(fieldid+'val');
- $.ajax({
- type: "POST",
- url: mw.util.wikiScript('api'),
- data: {'action':'validatesignup', 'format':'json',
'field':fieldtype, 'inputVal':inputVal },
- dataType: 'json',
- success: function( jsondata ){
- var image = "<img src='"+ imagePath + jsondata.signup.icon
+"'>";
- var message = jsondata.signup.result;
- valresult.innerHTML = image+message;
- }
- });
+ var inputVal = document.getElementById(fieldid).value;
+ var valresult = document.getElementById(fieldid+'val');
+ $.ajax({
+ type: "POST",
+ url: mw.util.wikiScript('api'),
+ data: {'action':'validatesignup', 'format':'json',
'field':fieldtype, 'inputVal':inputVal },
+ dataType: 'json',
+ success: function( jsondata ){
+ var image = "<img src='"+ imagePath +
jsondata.signup.icon +"'>";
+ var message = jsondata.signup.result;
+ valresult.innerHTML = image+message;
+ }
+ });
}
function passwordStrength() {
+ var strength = document.getElementById('wpPassword2val');
+ var strongRegex = new
RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
+ var mediumRegex = new
RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$",
"g");
+ var enoughRegex = new RegExp("(?=.{6,}).*", "g");
+ var pwd = document.getElementById("wpPassword2");
- var strength = document.getElementById('wpPassword2val');
- var strongRegex = new
RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
- var mediumRegex = new
RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$",
"g");
- var enoughRegex = new RegExp("(?=.{6,}).*", "g");
- var pwd = document.getElementById("wpPassword2");
-
- if (pwd.value.length==0) {
- strength.innerHTML = mw.message( 'signupapi-enterpassword' );
- } else if (pwd.value.length<minlength) {
- strength.innerHTML = mw.message( 'signupapi-passwordtooshort', minlength );
- $("#progress").progressbar({value: 10});
- $("div.ui-progressbar-value").css("background","red");
- } else if (strongRegex.test(pwd.value)) {
- strength.innerHTML = '<span style="color:green">'+mw.message(
'signupapi-strong' )+'</span>';
- $("#progress").progressbar({value: 100});
- $("div.ui-progressbar-value").css("background","green");
- } else if (mediumRegex.test(pwd.value)) {
- strength.innerHTML = '<span style="color:orange">'+mw.message(
'signupapi-medium' )+'</span>';
- $("#progress").progressbar({value: 60});
- $("div.ui-progressbar-value").css("background","orange");
- } else {
- strength.innerHTML = '<span style="color:red">'+mw.message(
'signupapi-weak' )+'</span>';
- $("#progress").progressbar({value: 30});
- $("div.ui-progressbar-value").css("background","red");
- }
+ if (pwd.value.length==0) {
+ strength.innerHTML = mw.message( 'signupapi-enterpassword' );
+ } else if (pwd.value.length<minlength) {
+ strength.innerHTML = mw.message( 'signupapi-passwordtooshort',
minlength );
+ $("#progress").progressbar({value: 10});
+ $("div.ui-progressbar-value").css("background","red");
+ } else if (strongRegex.test(pwd.value)) {
+ strength.innerHTML = '<span style="color:green">'+mw.message(
'signupapi-strong' )+'</span>';
+ $("#progress").progressbar({value: 100});
+ $("div.ui-progressbar-value").css("background","green");
+ } else if (mediumRegex.test(pwd.value)) {
+ strength.innerHTML = '<span style="color:orange">'+mw.message(
'signupapi-medium' )+'</span>';
+ $("#progress").progressbar({value: 60});
+ $("div.ui-progressbar-value").css("background","orange");
+ } else {
+ strength.innerHTML = '<span style="color:red">'+mw.message(
'signupapi-weak' )+'</span>';
+ $("#progress").progressbar({value: 30});
+ $("div.ui-progressbar-value").css("background","red");
+ }
}
-
function checkRetype( pass,retype ) {
- var valresult = document.getElementById('wpRetypeval');
- var image = "";
- var message = "";
- if ( pass==retype ) {
- image = "<img src='"+ imagePath +"MW-Icon-CheckMark.png'>";
- message = mw.message( 'signupapi-passwordsmatch' );
- }else {
- image = "<img src='"+ imagePath +"MW-Icon-NoMark.png'>";
- message = mw.message( 'signupapi-badretype' );
- }
- valresult.innerHTML = image+message;
+ var valresult = document.getElementById('wpRetypeval');
+ var image = "";
+ var message = "";
+ if ( pass==retype ) {
+ image = "<img src='"+ imagePath +"MW-Icon-CheckMark.png'>";
+ message = mw.message( 'signupapi-passwordsmatch' );
+ }else {
+ image = "<img src='"+ imagePath +"MW-Icon-NoMark.png'>";
+ message = mw.message( 'signupapi-badretype' );
+ }
+ valresult.innerHTML = image+message;
}
$('#wpName2').change(function() {validateInput("username","wpName2");});
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
