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

#3249 Cannot display unconfirmed accounts

RomanL 5 лет назад
Родитель
Сommit
ecd0552fca

+ 2 - 1
modules/boonex/accounts/classes/BxAccntModule.php

@@ -52,7 +52,8 @@ class BxAccntModule extends BxBaseModGeneralModule
         $iNumTotal = $o->getNum();
         
         $o->fillFilters(array(
-			'unconfirmed' => 1
+			'unconfirmed' => 1,
+            'non_robot' => 'Robot'
         ));
       
         return array('counter1_value' => $o->getNum(),'counter3_value' => $iNumTotal, 'counter1_caption' => _t('_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption'));

+ 21 - 2
modules/boonex/accounts/classes/BxAccntSearchResult.php

@@ -15,6 +15,24 @@ class BxAccntSearchResult extends BxBaseModGeneralSearchResult
     {
         parent::__construct($sMode, $aParams);
 
+        $aConfirmed = array();
+        $aUnConfirmed = array();
+        $sCnfnType = getParam('sys_account_confirmation_type');
+        switch($sCnfnType) {
+            case 'email':
+                $aConfirmed = array('value' => '', 'field' => 'email_confirmed', 'operator' => '=');
+                $aUnConfirmed = array('value' => '', 'field' => 'email_confirmed', 'operator' => '<>');
+                break;
+            case 'phone':
+                $aConfirmed = array('value' => '', 'field' => 'phone_confirmed', 'operator' => '=');
+                $aUnConfirmed = array('value' => '', 'field' => 'phone_confirmed', 'operator' => '<>');
+                break;
+            case 'email_and_phone':
+                $aConfirmed = array('value' => '', 'field' => 'phone_confirmed` * `email_confirmed', 'operator' => '=');
+                $aUnConfirmed = array('value' => '', 'field' => 'phone_confirmed` * `email_confirmed', 'operator' => '<>');
+                break;
+        }
+        
         $this->aCurrent =  array(
             'name' => 'bx_accounts',
             'module_name' => 'bx_accounts',
@@ -25,8 +43,9 @@ class BxAccntSearchResult extends BxBaseModGeneralSearchResult
             'ownFields' => array(),
             'searchFields' => array('name', 'email'),
             'restriction' => array(
-                'confirmed' => array('value' => '', 'field' => 'email_confirmed', 'operator' => '='),
-        		'unconfirmed' => array('value' => '', 'field' => 'email_confirmed', 'operator' => '<>'),
+                'confirmed' => $aConfirmed,
+        		'unconfirmed' => $aUnConfirmed,
+                'non_robot' => array('value' => '', 'field' => 'name', 'operator' => '<>'),
             ),
             'join' => array (),
             'paginate' => array('perPage' => 20, 'start' => 0),