Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/StartupAPI/users
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Chernyshev committed Jul 20, 2012
2 parents 0d224f6 + 8903bbc commit 46f4404
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions OAuthModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,11 @@ public function renderLoginForm($action)
?>
<p>Sign in using your existing account with <b><?php echo UserTools::escape($this->serviceName)?></b>.</p>
<form action="<?php echo $action?>" method="POST">
<input type="hidden" name="login" value="login"/>
<?php if (is_null($this->logInButtonURL)) { ?>
<input type="submit" name="login" value="Log in using <?php echo UserTools::escape($this->serviceName)?> &gt;&gt;&gt;"/>
<input type="submit" value="Log in using <?php echo UserTools::escape($this->serviceName)?> &gt;&gt;&gt;"/>
<?php } else { ?>
<input type="image" name="login" src="<?php echo UserTools::escape($this->logInButtonURL) ?>" value="login"/>
<input type="image" src="<?php echo UserTools::escape($this->logInButtonURL) ?>" value="login"/>
<?php } ?>
</form>
<?php
Expand All @@ -379,10 +380,11 @@ public function renderRegistrationForm($full = false, $action = null, $errors =
}
?>
<form action="<?php echo $action?>" method="POST">
<input type="hidden" name="register" value="register"/>
<?php if (is_null($this->signUpButtonURL)) { ?>
<input type="submit" name="register" value="Register using <?php echo UserTools::escape($this->serviceName)?>&gt;&gt;&gt;"/>
<input type="submit" value="Register using <?php echo UserTools::escape($this->serviceName)?>&gt;&gt;&gt;"/>
<?php } else { ?>
<input type="image" name="register" src="<?php echo UserTools::escape($this->signUpButtonURL) ?>" value="register"/>
<input type="image" src="<?php echo UserTools::escape($this->signUpButtonURL) ?>"/>
<?php } ?>
</form>
<?php
Expand Down Expand Up @@ -475,10 +477,11 @@ public function renderEditUserForm($action, $errors, $user, $data)
<?php
if (is_null($oauth_user_id)) {
if (is_null($this->connectButtonURL)) {
?><input type="submit" name="add" value="Connect existing <?php echo $this->getTitle() ?> account &gt;&gt;&gt;"/><?php
?><input type="submit" value="Connect existing <?php echo $this->getTitle() ?> account &gt;&gt;&gt;"/><?php
} else {
?><input type="image" name="add" src="<?php echo UserTools::escape($this->connectButtonURL) ?>" value="add"/><?php
?><input type="image" src="<?php echo UserTools::escape($this->connectButtonURL) ?>"/><?php
}
?><input type="hidden" name="add" value="add"/><?php
} else {
?>
<div><?php $this->renderUserInfo($serialized_userinfo) ?></div>
Expand Down

0 comments on commit 46f4404

Please sign in to comment.