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

inc/classes/BxDolAccount.php

@@ -90,27 +90,36 @@ class BxDolAccount extends BxDolFactory implements iBxDolSingleton
      */
     public function isConfirmed($iAccountId = false)
     {
+        $iId = (int)$iAccountId ? (int)$iAccountId : $this->_iAccountID;
+
+        $a = $this->getInfo($iId);
+
+        $bResult = false;
         $sConfirmationType = getParam('sys_account_confirmation_type');
-        if ($sConfirmationType == BX_ACCOUNT_CONFIRMATION_NONE) 
-            return true;
-        
-        $a = $this->getInfo((int)$iAccountId);
-        
-        switch ($sConfirmationType) {
+        switch($sConfirmationType) {
+            case BX_ACCOUNT_CONFIRMATION_NONE:
+                $bResult = true;
+                break;
+
             case BX_ACCOUNT_CONFIRMATION_EMAIL:
-                if ($a['email_confirmed'])
-                    return true;
+                if($a['email_confirmed'])
+                    $bResult = true;
                 break;
+
             case BX_ACCOUNT_CONFIRMATION_PHONE:
-                if ($a['phone_confirmed'])
-                    return true;
+                if($a['phone_confirmed'])
+                    $bResult = true;
                 break;
+
             case BX_ACCOUNT_CONFIRMATION_EMAIL_PHONE:
-                if ($a['email_confirmed'] && $a['phone_confirmed'])
-                    return true;
+                if($a['email_confirmed'] && $a['phone_confirmed'])
+                    $bResult = true;
                 break;
         }
-        return false;
+
+        bx_alert('account', 'is_confirmed', $iId, false, array('type' => $sConfirmationType, 'override_result' => &$bResult));
+
+        return $bResult;
     }
     
     public function getCurrentConfirmationStatusValue($iAccountId = false)
@@ -127,23 +136,43 @@ class BxDolAccount extends BxDolFactory implements iBxDolSingleton
         }
         return BX_ACCOUNT_CONFIRMATION_NONE;
     }
-    
+
     public function isConfirmedEmail($iAccountId = false)
     {
-        if (!self::isNeedConfirmEmail())
-            return true;
-        $a = $this->getInfo((int)$iAccountId);
-        return $a['email_confirmed'] ? true : false;
+        $iId = (int)$iAccountId ? (int)$iAccountId : $this->_iAccountID;
+
+        $bResult = false;
+        if(self::isNeedConfirmEmail()) {
+            $a = $this->getInfo($iId);
+
+            $bResult = $a['email_confirmed'] ? true : false;
+        }
+        else 
+            $bResult = true;
+
+        bx_alert('account', 'is_confirmed_email', $iId, false, array('override_result' => &$bResult));
+
+        return $bResult;
     }
-    
+
     public function isConfirmedPhone($iAccountId = false)
     {
-        if (!self::isNeedConfirmPhone())
-            return true;
-        $a = $this->getInfo((int)$iAccountId);
-        return $a['phone_confirmed'] ? true : false;
+        $iId = (int)$iAccountId ? (int)$iAccountId : $this->_iAccountID;
+
+        $bResult = false;        
+        if(self::isNeedConfirmPhone()) {
+            $a = $this->getInfo((int)$iAccountId);
+
+            $bResult = $a['phone_confirmed'] ? true : false;
+        }
+        else
+            $bResult = true;
+
+        bx_alert('account', 'is_confirmed_phone', $iId, false, array('override_result' => &$bResult));
+
+        return $bResult;
     }
-    
+
     static public function isNeedConfirmEmail()
     {
         if (getParam('sys_account_confirmation_type') == BX_ACCOUNT_CONFIRMATION_EMAIL || getParam('sys_account_confirmation_type') == BX_ACCOUNT_CONFIRMATION_EMAIL_PHONE) 

inc/js/classes/BxDolMenuMoreAuto.js

@@ -118,7 +118,7 @@ BxDolMenuMoreAuto.prototype._moveToSubmenu = function(oMenu, oItemMore, oItemMor
 
     if(oItemMoreSubmenu.find('li').length)
         oItemMore.show(function() {
-            oMenu.addClass($this._sClassReady);
+            oMenu.addClass($this._sClassReady).parents('.bx-menu-more-auto-wrapper:first').css('overflow', 'visible');
         });
 };
 

modules/boonex/timeline/template/css/view.css

@@ -424,9 +424,6 @@ div.bx-tl-item div.bx-tl-item-image {
 }
 
 /*--- Item Activity (Actions and Manage are different menus) ---*/
-div.bx-tl-item div.bx-tl-item-activity {
-    overflow: hidden;
-}
 div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom:not(.bx-menu-submenu-more-auto) {
     position: relative;
     display: -webkit-flex;

template/menu_more_auto.html

@@ -0,0 +1 @@
+<div class="bx-menu-more-auto-wrapper" style="overflow:hidden;">__menu__</div>

template/scripts/BxBaseMenuMoreAuto.php

@@ -43,9 +43,15 @@ class BxBaseMenuMoreAuto extends BxTemplMenu
     {
         $sResult = parent::getCode();
 
-        if($this->_isMoreAuto())
+        if($this->_isMoreAuto()) {
             $this->_oTemplate->addJs(array('BxDolMenuMoreAuto.js'));
 
+            if(!empty($sResult))
+                $sResult = $this->_oTemplate->parseHtmlByName('menu_more_auto.html', array(
+                    'menu' => $sResult
+                ));
+        }
+
         return $sResult;
     }