Currently we have some license issues. We are working on it.

Verified Commit 4deb7694 authored by noplanman's avatar noplanman
Browse files

Some touch-ups and fixes to the code and UI, fix deploy script.

parent 2170840c
......@@ -69,7 +69,7 @@ class Wp_Otp_Admin {
return;
}
check_admin_referer( 'wp_otp_code', 'wp_otp_code' );
check_admin_referer( 'wp_otp_nonce', 'wp_otp_nonce' );
$user = get_userdata( $user_id );
......
.wp-otp-app-box {
background-color: #fff;
display: inline-block;
margin: 8px 16px;
padding: 4px 8px;
}
.wp-otp-link-reconfigure,
.wp-otp-link-new-recovery-codes {
margin: 4px !important;
display: inline-block;
margin: 4px !important;
}
.wp-otp-recovery-codes-box del,
.wp-otp-recovery-codes-box span {
font-weight: normal;
display: block;
font-weight: normal;
margin: 4px;
}
.wp-otp-recovery-codes-box del {
color: #800;
}
#wp_otp_qr_code {
background-color: #fff;
width: 222px;
}
......@@ -42,12 +42,12 @@
<?php else : ?>
<em><?php esc_html_e( 'To activate WP-OTP, enter the One Time Password from your authenticator app and save your profile.', 'wp-otp' ); ?></em><br><br>
<label for="wp_otp_code"><?php esc_html_e( 'One Time Password', 'wp-otp' ); ?></label><br>
<input type="text" size="25" name="wp_otp_code" id="wp_otp_code"/>
<?php wp_nonce_field( 'wp_otp_nonce', 'wp_otp_nonce' ); ?>
<input type="text" class="input" name="wp_otp_code" id="wp_otp_code"/>
<?php wp_nonce_field( 'wp_otp_nonce', 'wp_otp_nonce', false ); ?>
<?php endif; ?>
</th>
<td>
<img src="<?php echo esc_attr( $otp_qr_code_img_uri ); ?>" alt="<?php esc_attr_e( 'QR Code to scan with mobile app', 'wp-otp' ); ?>" style="background-color:#fff;"/><br>
<img id="wp_otp_qr_code" src="<?php echo esc_attr( $otp_qr_code_img_uri ); ?>" alt="<?php esc_attr_e( 'QR Code to scan with mobile app', 'wp-otp' ); ?>"/><br>
</td>
<td>
<span class="description">
......
......@@ -112,6 +112,7 @@ echo " ✅ Done."
echo
printf "Exporting the HEAD of master from git to the trunk of SVN..."
rm -rf "${SVN_PATH}/trunk"/*
git checkout-index -a -f --prefix="${SVN_PATH}/trunk/"
if [[ -d "${SVN_PATH}/trunk/assets" ]]; then
mv -f "${SVN_PATH}/trunk/assets"/* "${SVN_PATH}/assets"
......@@ -136,7 +137,7 @@ printf " - Removing deleted files..."
svn status | grep -v "^.[ \t]*\..*" | grep "^\!" | awk '{print $2}' | xargs svn del &>/dev/null
echo " ✅ Done."
printf " - Commit assets..."
svn commit --username="${SVN_USER}"
svn commit --username="${SVN_USER}" -m "Version ${NEW_VERSION}"
echo " ✅ Done!"
echo
......@@ -168,7 +169,7 @@ svn status | grep -v "^.[ \t]*\..*" | grep "^\!" | awk '{print $2}' | xargs svn
echo " ✅ Done."
printf " - Commit to trunk..."
svn commit --username="${SVN_USER}"
svn commit --username="${SVN_USER}" -m "Version ${NEW_VERSION}"
echo " ✅ Done!"
echo
......
......@@ -189,8 +189,8 @@ class Wp_Otp_Public {
*
* @since 0.3.0
*
* @param TOTP $otp OTP object.
* @param string $otp_code OTP code to be verified.
* @param TOTPInterface $otp OTP object.
* @param string $otp_code OTP code to be verified.
*
* @return bool
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment