Просмотр исходного кода

Merge branch 'master' of https://github.com/unaio/una

AntonLV 4 лет назад
Родитель
Сommit
a2d971ea31

+ 4 - 0
inc/classes/BxDolAccount.php

@@ -680,6 +680,7 @@ class BxDolAccount extends BxDolFactory implements iBxDolSingleton
                 $oInformer->add('sys-account-unconfirmed-phone', _t('_sys_txt_account_unconfirmed_phone', $sUrl), BX_INFORMER_ALERT);
             }
         }
+        $this->isNeedChangePassword();
     }
 
     /**
@@ -759,6 +760,9 @@ class BxDolAccount extends BxDolFactory implements iBxDolSingleton
         if (isset($aPageParams['i']) && $aPageParams['i'] == 'account-settings-password')
             $bNeedRedirectToChangePassword = false;
 
+        
+        bx_alert('account', 'is_need_to_change_password',  $iAccountId, false, array('override_result' => &$bNeedRedirectToChangePassword));
+        
         if ($aAccountInfo['password_expired'] >0 && $aAccountInfo['password_expired'] < time() && $bNeedRedirectToChangePassword){
             if (getParam('sys_account_accounts_force_password_change_after_expiration') == 'on'){
                 header('Location: ' . BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=account-settings-password'));

+ 9 - 2
studio/template/css/launcher.css

@@ -395,5 +395,12 @@ div.bx-std-widget-caption a {
     display: none;
 }
 
-
-
+#bx-informer{
+    position: fixed;
+    bottom: 0px;
+    width: calc(100% - 2.5rem);
+    left: 0px
+}
+#bx-informer .bx-informer-msg{
+    background-color: rgba(255, 234, 193, 1);
+}

+ 2 - 0
studio/template/scripts/BxBaseStudioLauncher.php

@@ -88,6 +88,8 @@ class BxBaseStudioLauncher extends BxDolStudioLauncher
         if (getParam('site_tour_studio') == 'on')
             $sResult .= $oTemplate->parseHtmlByName('launcher_tour.html', array());
 
+        $sResult .= BxDolInformer::getInstance($oTemplate)->display();
+        
         $oTemplate->addInjection('injection_body_style', 'text', ' bx-std-page-launcher');
         return $sResult;
     }