Version 5.0.0 beta 10
This commit is contained in:
1 parent
56979f8ee8
commit
264eeb97e0
325 files changed
+6442
-1849
No files matched your search
@@ -851,7 +851,7 @@ IPSCONTENT;
|
||||
if ( \in_array( 'authy', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='i-text-align_center'>
|
||||
<div class='i-flex i-align-items_center i-justify-content_center i-flex-wrap_wrap i-gap_2'>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -868,7 +868,7 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->resource( "appstores/ios/{$langCode}.svg", "core", 'global', false );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="i-margin-block_2"></a>
|
||||
" alt=""></a>
|
||||
<a href="
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -879,7 +879,7 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->resource( "appstores/android/{$langCode}.png", "core", 'global', false );
|
||||
$return .= <<<IPSCONTENT
|
||||
" style="height: 60px"></a>
|
||||
" style="height: 60px" alt=""></a>
|
||||
</div>
|
||||
|
||||
IPSCONTENT;
|
||||
@@ -888,8 +888,8 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="i-padding_3">
|
||||
<div class='ipsSpanGrid'>
|
||||
<div class='ipsSpanGrid__5 i-text-align_center'>
|
||||
<div class='i-grid i-gap_1'>
|
||||
<div>
|
||||
<select class="ipsInput ipsInput--select" data-sort name="countryCode">
|
||||
|
||||
IPSCONTENT;
|
||||
@@ -958,7 +958,7 @@ $return .= <<<IPSCONTENT
|
||||
|
||||
</select>
|
||||
</div>
|
||||
<div class='ipsSpanGrid__7 i-text-align_center'>
|
||||
<div>
|
||||
<input name="phoneNumber" type="tel" class="ipsInput ipsInput--text" value="
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $phoneNumber, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
@@ -990,23 +990,21 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
<div class="i-padding_3 i-background_3 ipsSpanGrid">
|
||||
<div class="i-padding_3 i-background_3 ipsButtons ipsButtons--fill">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \in_array( 'authy', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="ipsSpanGrid__12">
|
||||
<button type='submit' name="method" value="authy" class='ipsButton ipsButton--primary ipsButton--wide'>
|
||||
<i class='fa-solid fa-lock'></i>
|
||||
<button type='submit' name="method" value="authy" class='ipsButton ipsButton--primary'>
|
||||
<i class='fa-solid fa-lock'></i>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'authy_submit_authy', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</button>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -1019,31 +1017,14 @@ IPSCONTENT;
|
||||
if ( \in_array( 'phone', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="ipsSpanGrid__
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \in_array( 'sms', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
6
|
||||
IPSCONTENT;
|
||||
|
||||
else:
|
||||
$return .= <<<IPSCONTENT
|
||||
12
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
">
|
||||
<button type='submit' name="method" value="phone" class='ipsButton ipsButton--primary ipsButton--wide'>
|
||||
<i class='fa-solid fa-phone'></i>
|
||||
<button type='submit' name="method" value="phone" class='ipsButton ipsButton--primary'>
|
||||
<i class='fa-solid fa-phone'></i>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'authy_submit_call', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</button>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -1056,31 +1037,14 @@ IPSCONTENT;
|
||||
if ( \in_array( 'sms', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="ipsSpanGrid__
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \in_array( 'phone', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
6
|
||||
IPSCONTENT;
|
||||
|
||||
else:
|
||||
$return .= <<<IPSCONTENT
|
||||
12
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
">
|
||||
<button type='submit' name="method" value="sms" class='ipsButton ipsButton--primary ipsButton--wide'>
|
||||
<i class='fa-solid fa-commenting'></i>
|
||||
<button type='submit' name="method" value="sms" class='ipsButton ipsButton--primary'>
|
||||
<i class='fa-solid fa-commenting'></i>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'authy_submit_sms', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</button>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -1302,7 +1266,8 @@ IPSCONTENT;
|
||||
$langCode = mb_substr( \IPS\Member::loggedIn()->language()->bcp47(), 0, 2 );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a href="
|
||||
<div class="i-flex i-align-items_center i-justify-content_center i-flex-wrap_wrap i-gap_2">
|
||||
<a href="
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Http\Url::ips( "docs/googleauth_ios" );
|
||||
@@ -1312,8 +1277,8 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->resource( "appstores/ios/{$langCode}.svg", "core", 'global', false );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="i-margin-block_2"></a>
|
||||
<a href="
|
||||
" alt=""></a>
|
||||
<a href="
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Http\Url::ips( "docs/googleauth_android" );
|
||||
@@ -1323,16 +1288,17 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->resource( "appstores/android/{$langCode}.png", "core", 'global', false );
|
||||
$return .= <<<IPSCONTENT
|
||||
" style="height: 60px"></a>
|
||||
" style="height: 60px" alt=""></a>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<a class="i-cursor_pointer" data-action="showManual">
|
||||
<div>
|
||||
<button type="button" class="i-cursor_pointer" data-action="showManual">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'google_mfa_help', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</a>
|
||||
</p>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1450,7 +1416,8 @@ IPSCONTENT;
|
||||
$langCode = mb_substr( \IPS\Member::loggedIn()->language()->bcp47(), 0, 2 );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a href="
|
||||
<div class="i-flex i-align-items_center i-justify-content_center i-flex-wrap_wrap i-gap_2">
|
||||
<a href="
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Http\Url::ips( "docs/googleauth_ios" );
|
||||
@@ -1460,8 +1427,8 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->resource( "appstores/ios/{$langCode}.svg", "core", 'global', false );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="i-margin-block_2"></a>
|
||||
<a href="
|
||||
" alt=""></a>
|
||||
<a href="
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Http\Url::ips( "docs/googleauth_android" );
|
||||
@@ -1471,16 +1438,17 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->resource( "appstores/android/{$langCode}.png", "core", 'global', false );
|
||||
$return .= <<<IPSCONTENT
|
||||
" style="height: 60px"></a>
|
||||
" style="height: 60px" alt=""></a>
|
||||
</div>
|
||||
|
||||
<p class='i-text-align_center'>
|
||||
<a class="i-cursor_pointer" data-action="showBarcode">
|
||||
<div class='i-text-align_center'>
|
||||
<button type="button" class="i-cursor_pointer" data-action="showBarcode">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'google_mfa_help_reset', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</a>
|
||||
</p>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1870,19 +1838,19 @@ $return .= <<<IPSCONTENT
|
||||
|
||||
</p>
|
||||
<div class="i-padding_3">
|
||||
<ul>
|
||||
<ul class="ipsButtons ipsButtons--fill">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
foreach ( $handlers as $key => $handler ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li class="i-margin-bottom_2">
|
||||
<li>
|
||||
<a href="
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $url->setQueryString( array( '_mfa' => 'alt', '_mfaMethod' => $key ) ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="ipsButton ipsButton--primary ipsButton--wide">
|
||||
" class="ipsButton ipsButton--primary">
|
||||
IPSCONTENT;
|
||||
|
||||
$val = "{$handler->recoveryButton()}"; $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( $val, ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
@@ -1901,11 +1869,11 @@ IPSCONTENT;
|
||||
if ( $knownDevicesAvailable ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li class="i-margin-bottom_2"><a href="
|
||||
<li><a href="
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $url->setQueryString( array( '_mfa' => 'knownDevice' ) ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="ipsButton ipsButton--soft ipsButton--wide">
|
||||
" class="ipsButton ipsButton--soft">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'mfa_recovery_known_device', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
@@ -1923,12 +1891,12 @@ IPSCONTENT;
|
||||
if ( \in_array( 'email', explode( ',', \IPS\Settings::i()->mfa_forgot_behaviour ) ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li class="i-margin-bottom_2"><a href="
|
||||
<li><a href="
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=settings&do=mfarecovery", "front", "mfarecovery", array(), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="ipsButton ipsButton--text ipsButton--wide">
|
||||
" class="ipsButton ipsButton--text">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'mfa_recovery_email', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
@@ -1946,12 +1914,12 @@ IPSCONTENT;
|
||||
if ( \in_array( 'contact', explode( ',', \IPS\Settings::i()->mfa_forgot_behaviour ) ) and \IPS\Member::loggedIn()->canUseContactUs() ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li class="i-margin-bottom_2"><a href="
|
||||
<li><a href="
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=contact&controller=contact", "front", "contact", array(), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class="ipsButton ipsButton--text ipsButton--wide">
|
||||
" class="ipsButton ipsButton--text">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'mfa_recovery_contact', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
@@ -2002,7 +1970,7 @@ IPSCONTENT;
|
||||
if ( \count( $acceptableHandlers ) > 1 ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='i-background_3 i-text-align_center'>
|
||||
<div class='i-background_2 i-text-align_center'>
|
||||
<div class='i-padding_3'>
|
||||
<h1 class='i-text-align_center ipsTitle ipsTitle--h3'>
|
||||
IPSCONTENT;
|
||||
@@ -2019,7 +1987,7 @@ $return .= <<<IPSCONTENT
|
||||
|
||||
</p>
|
||||
</div>
|
||||
<i-tabs class='ipsTabs ipsTabs--small ipsTabs--stretch' id='ipsTabs_2fa' data-ipsTabBar data-ipsTabBar-contentArea='#ipsTabs_2fa_content'>
|
||||
<i-tabs class='ipsTabs ipsTabs--small ipsTabs--stretch i-background_2' id='ipsTabs_2fa' data-ipsTabBar data-ipsTabBar-contentArea='#ipsTabs_2fa_content'>
|
||||
<div role='tablist'>
|
||||
|
||||
IPSCONTENT;
|
||||
@@ -3544,8 +3512,8 @@ $return .= <<<IPSCONTENT
|
||||
</div>
|
||||
</div>
|
||||
<div class="i-padding_3">
|
||||
<div class='ipsSpanGrid'>
|
||||
<div class='ipsSpanGrid__5 i-text-align_center'>
|
||||
<div class='i-grid i-gap_2'>
|
||||
<div>
|
||||
<select class="ipsInput ipsInput--select" data-sort name="countryCode">
|
||||
|
||||
IPSCONTENT;
|
||||
@@ -3614,7 +3582,7 @@ $return .= <<<IPSCONTENT
|
||||
|
||||
</select>
|
||||
</div>
|
||||
<div class='ipsSpanGrid__7 i-text-align_center'>
|
||||
<div>
|
||||
<input name="phoneNumber" type="tel" value="
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $phoneNumber, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
@@ -3646,68 +3614,62 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
<div class="i-padding_3 i-background_3">
|
||||
|
||||
<div class="i-padding_3 i-background_3 ipsButtons ipsButtons--fill">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \in_array( 'phone', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="i-margin-bottom_3">
|
||||
<button type='submit' name="method" value="phone" class='ipsButton ipsButton--primary ipsButton--wide'>
|
||||
<i class='fa-solid fa-phone'></i>
|
||||
<button type='submit' name="method" value="phone" class='ipsButton ipsButton--primary'>
|
||||
<i class='fa-solid fa-phone'></i>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'verify_submit_call', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</button>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \in_array( 'sms', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="i-margin-bottom_3">
|
||||
<button type='submit' name="method" value="sms" class='ipsButton ipsButton--primary ipsButton--wide'>
|
||||
<i class='fa-solid fa-comment-dots'></i>
|
||||
<button type='submit' name="method" value="sms" class='ipsButton ipsButton--primary'>
|
||||
<i class='fa-solid fa-comment-dots'></i>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'verify_submit_sms', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</button>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \in_array( 'whatsapp', $methods ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class="i-margin-bottom_3">
|
||||
<button type='submit' name="method" value="whatsapp" class='ipsButton ipsButton--primary ipsButton--wide'>
|
||||
<i class='fa-reguar fa-comment'></i>
|
||||
<button type='submit' name="method" value="whatsapp" class='ipsButton ipsButton--primary'>
|
||||
<i class='fa-reguar fa-comment'></i>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'verify_submit_whatsapp', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</button>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
|
||||
Reference in new issue
Block a user