makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] More small fixes

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-09-02 16:52:24 -04:00
parent 29e3768ecc
commit ae18f921ea
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_register.php
View file

@ -417,7 +417,7 @@ class ucp_register
} }
// Perform account linking if necessary // Perform account linking if necessary
if ($login_link_data !== array()) if (!empty($login_link_data))
{ {
$login_link_data['user_id'] = $user_id; $login_link_data['user_id'] = $user_id;

2
phpBB/styles/prosilver/template/login_body_oauth.html
View file

@ -4,5 +4,5 @@
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd> <dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd>
</dl> </dl>
<!-- END oauth --> <!-- END oauth -->
</div> </div>

10
phpBB/styles/prosilver/template/ucp_login_link.html
View file

@ -18,7 +18,7 @@
<fieldset class="fields1"> <fieldset class="fields1">
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="6" value="{L_REGISTER}" class="button1" /></dd> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></dd>
</dl> </dl>
</fieldset> </fieldset>
</form> </form>
@ -32,21 +32,21 @@
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF --> <!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl> <dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt> <dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>
<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd> <dd><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt> <dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>
<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd> <dd><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
</dl> </dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE --> <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- DEFINE $CAPTCHA_TAB_INDEX = 3 --> <!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} --> <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF --> <!-- ENDIF -->
{S_LOGIN_REDIRECT} {S_LOGIN_REDIRECT}
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
</dl> </dl>
</fieldset> </fieldset>
</form> </form>

2
tests/auth/provider_oauth_token_storage_test.php
View file

@ -197,7 +197,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c
{ {
// Test that the token is stored in the database // Test that the token is stored in the database
$sql = 'SELECT * FROM phpbb_oauth_tokens $sql = 'SELECT * FROM phpbb_oauth_tokens
WHERE session_id = \'' . $session_id . '\''; WHERE session_id = \'' . $this->db->sql_escape($session_id) . '\'';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);