Ticket #1972

unacms · Feb 25, 2019 · b6e6c75 · b6e6c75
1 parent ce61d91
commit b6e6c75
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 67 deletions.
diff --git a/modules/boonex/accounts/classes/BxAccntConfig.php b/modules/boonex/accounts/classes/BxAccntConfig.php
@@ -40,6 +40,7 @@ public function __construct($aModule)
                 'filter_item_operators' => '_bx_accnt_grid_filter_item_title_adm_operators',
             	'filter_item_pending' => '_bx_accnt_grid_filter_item_title_adm_pending',
             	'filter_item_suspended' => '_bx_accnt_grid_filter_item_title_adm_suspended',
+                'filter_item_unconfirmed' => '_bx_accnt_grid_filter_item_title_adm_unconfirmed',
                 'filter_item_locked' => '_bx_accnt_grid_filter_item_title_adm_locked',
             	'filter_item_select_one_filter1' => '_bx_accnt_grid_filter_item_title_adm_select_one_filter1',
                 'filter_item_select_one_filter2' => '_bx_accnt_grid_filter_item_title_adm_select_one_filter2',

diff --git a/modules/boonex/accounts/classes/BxAccntGridAdministration.php b/modules/boonex/accounts/classes/BxAccntGridAdministration.php
@@ -19,10 +19,13 @@ public function __construct ($aOptions, $oTemplate = false)
     {
     	$this->MODULE = 'bx_accounts';
         parent::__construct ($aOptions, $oTemplate);
-        
+
         $CNF = &$this->_oModule->_oConfig->CNF;
-        $this->_aFilter1Values['locked'] = $CNF['T']['filter_item_locked'];
-
+        $this->_aFilter1Values = array_merge($this->_aFilter1Values, array(
+            'unconfirmed' => $CNF['T']['filter_item_unconfirmed'],
+            'locked' => $CNF['T']['filter_item_locked'],
+        ));
+
         $this->_sFilter2Name = 'filter2';
         $this->_aFilter2Values = array(
             'operators' => $CNF['T']['filter_item_operators']
@@ -40,13 +43,31 @@ protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPe
         if(strpos($sFilter, $this->_sParamsDivider) !== false)
             list($this->_sFilter1Value, $this->_sFilter2Value, $sFilter) = explode($this->_sParamsDivider, $sFilter);
 
-    	if(!empty($this->_sFilter1Value)){
-            if ($this->_sFilter1Value != 'locked')
+    	if(!empty($this->_sFilter1Value))
+            switch($this->_sFilter1Value) {
+                case 'unconfirmed':
+                    $sCnfnType = getParam('sys_account_confirmation_type');
+                    switch($sCnfnType) {
+                        case 'email':
+                            $this->_aOptions['source'] .= " AND `ta`.`email_confirmed`='0'";
+                            break;
+                        case 'phone':
+                            $this->_aOptions['source'] .= " AND `ta`.`phone_confirmed`='0'";
+                            break;
+                        case 'email_and_phone':
+                            $this->_aOptions['source'] .= " AND (`ta`.`email_confirmed`='0' OR `ta`.`phone_confirmed`='0')";
+                            break;
+                    }
+                    break;
+
+                case 'locked':
+                    $this->_aOptions['source'] .= " AND `ta`.`locked` = 1";
+                    break;
+
+                default:
         	    $this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `tp`.`status`=?", $this->_sFilter1Value);
-            else
-                $this->_aOptions['source'] .= " AND `ta`.`locked` = 1";
-        }
-
+            }
+
         if(!empty($this->_sFilter2Value))
         	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `ta`.`role` & " . BX_DOL_ROLE_ADMIN ." = " . BX_DOL_ROLE_ADMIN);
 

diff --git a/modules/boonex/accounts/install/langs/en.xml b/modules/boonex/accounts/install/langs/en.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
-	<string name="_bx_accnt"><![CDATA[Accounts]]></string>
-	<string name="_bx_accounts"><![CDATA[Accounts]]></string>
+    <string name="_bx_accnt"><![CDATA[Accounts]]></string>
+    <string name="_bx_accounts"><![CDATA[Accounts]]></string>
 
-	<string name="_bx_accounts_form_display_account_settings_email_popup"><![CDATA[Edit Email]]></string>
-	<string name="_bx_accounts_form_display_account_settings_password_popup"><![CDATA[Reset Password]]></string>
+    <string name="_bx_accounts_form_display_account_settings_email_popup"><![CDATA[Edit Email]]></string>
+    <string name="_bx_accounts_form_display_account_settings_password_popup"><![CDATA[Reset Password]]></string>
 
-	<string name="_bx_accnt_page_title_sys_manage_administration"><![CDATA[Manage All Accounts]]></string>
-	<string name="_bx_accnt_page_title_manage"><![CDATA[Manage Accounts]]></string>
-	<string name="_bx_accnt_page_title_browse"><![CDATA[Accounts]]></string>
+    <string name="_bx_accnt_page_title_sys_manage_administration"><![CDATA[Manage All Accounts]]></string>
+    <string name="_bx_accnt_page_title_manage"><![CDATA[Manage Accounts]]></string>
+    <string name="_bx_accnt_page_title_browse"><![CDATA[Accounts]]></string>
 
-	<string name="_bx_accnt_page_block_title_system_manage_administration"><![CDATA[Manage All Accounts]]></string>
-	<string name="_bx_accnt_page_block_title_manage"><![CDATA[Manage Accounts]]></string>
+    <string name="_bx_accnt_page_block_title_system_manage_administration"><![CDATA[Manage All Accounts]]></string>
+    <string name="_bx_accnt_page_block_title_manage"><![CDATA[Manage Accounts]]></string>
 
-	<string name="_bx_accnt_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
+    <string name="_bx_accnt_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_accnt_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_accnt_menu_item_title_system_resend_cemail"><![CDATA[Resend Confirmation]]></string>
     <string name="_bx_accnt_menu_item_title_resend_cemail"><![CDATA[Resend Confirmation]]></string>
@@ -31,30 +31,31 @@
     <string name="_bx_accnt_menu_item_title_make_operator"><![CDATA[Make Operator]]></string>
     <string name="_bx_accnt_menu_item_title_system_unmake_operator"><![CDATA[Unmake Operator]]></string>
     <string name="_bx_accnt_menu_item_title_unmake_operator"><![CDATA[Unmake Operator]]></string>
-	<string name="_bx_accnt_menu_item_title_system_admt_accounts"><![CDATA[Accounts]]></string>
-	<string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Accounts - {addon} unconfirmed]]></string>
-	<string name="_bx_accnt_menu_item_title_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_accnt_menu_item_title_system_admt_accounts"><![CDATA[Accounts]]></string>
+    <string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Accounts - {addon} unconfirmed]]></string>
+    <string name="_bx_accnt_menu_item_title_manage"><![CDATA[Manage]]></string>
 
-	<string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Edit Any Account]]></string>
+    <string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Edit Any Account]]></string>
 
-	<string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-  <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter2"><![CDATA[All]]></string>
-	<string name="_bx_accnt_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-  <string name="_bx_accnt_grid_filter_item_title_adm_operators"><![CDATA[Operators]]></string>
-	<string name="_bx_accnt_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-	<string name="_bx_accnt_grid_filter_item_title_adm_suspended"><![CDATA[Suspended]]></string>
-  <string name="_bx_accnt_grid_filter_item_title_adm_locked"><![CDATA[Locked]]></string>
-	<string name="_bx_accnt_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter2"><![CDATA[All]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_operators"><![CDATA[Operators]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_suspended"><![CDATA[Suspended]]></string>    
+    <string name="_bx_accnt_grid_filter_item_title_adm_unconfirmed"><![CDATA[Unconfirmed]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_locked"><![CDATA[Locked]]></string>
+    <string name="_bx_accnt_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_accnt_grid_column_title_adm_name"><![CDATA[Name]]></string>
     <string name="_bx_accnt_grid_column_title_adm_email"><![CDATA[Email]]></string>
-  <string name="_bx_accnt_grid_column_title_adm_ip"><![CDATA[IP]]></string>
-  
-  <string name="_bx_accnt_grid_column_title_adm_is_confirmed"><![CDATA[Confirmed]]></string>
+    <string name="_bx_accnt_grid_column_title_adm_ip"><![CDATA[IP]]></string>
+
+    <string name="_bx_accnt_grid_column_title_adm_is_confirmed"><![CDATA[Confirmed]]></string>
     <string name="_bx_accnt_grid_column_title_adm_profiles"><![CDATA[Profiles]]></string>
     <string name="_bx_accnt_grid_column_title_adm_logged"><![CDATA[Last Online]]></string>
     <string name="_bx_accnt_grid_action_title_adm_activate"><![CDATA[Activate]]></string>
-	<string name="_bx_accnt_grid_action_title_adm_suspend"><![CDATA[Suspend]]></string>
-	<string name="_bx_accnt_grid_action_title_adm_edit_email"><![CDATA[Edit Email]]></string>
+    <string name="_bx_accnt_grid_action_title_adm_suspend"><![CDATA[Suspend]]></string>
+    <string name="_bx_accnt_grid_action_title_adm_edit_email"><![CDATA[Edit Email]]></string>
     <string name="_bx_accnt_grid_action_title_adm_resend_cemail"><![CDATA[Resend Confirmation]]></string>
     <string name="_bx_accnt_grid_action_title_adm_reset_password"><![CDATA[Reset Password]]></string>
     <string name="_bx_accnt_grid_action_title_adm_unlock_account"><![CDATA[Unlock]]></string>
@@ -65,12 +66,12 @@
     <string name="_bx_accnt_grid_action_err_perform"><![CDATA[Cannot perform the action for selected account(s).]]></string>
     <string name="_bx_accnt_grid_action_unlock_successed"><![CDATA[Successfully unlocked]]></string>
     <string name="_bx_accnt_grid_action_unlock_error"><![CDATA[Account is not blocked]]></string>
-  <string name="_bx_accnt_grid_confirmation_status_none"><![CDATA[No]]></string>
+    <string name="_bx_accnt_grid_confirmation_status_none"><![CDATA[No]]></string>
     <string name="_bx_accnt_grid_confirmation_status_email"><![CDATA[Email]]></string>
     <string name="_bx_accnt_grid_confirmation_status_phone"><![CDATA[Phone]]></string>
     <string name="_bx_accnt_grid_confirmation_status_email_and_phone"><![CDATA[All]]></string>
 
-	<string name="_bx_accnt_txt_more"><![CDATA[{0} more]]></string>
-	<string name="_bx_accnt_txt_see_more"><![CDATA[See more]]></string>
-	<string name="_bx_accnt_txt_copy_to_clipboard"><![CDATA[Copy to Clipboard]]></string>
+    <string name="_bx_accnt_txt_more"><![CDATA[{0} more]]></string>
+    <string name="_bx_accnt_txt_see_more"><![CDATA[See more]]></string>
+    <string name="_bx_accnt_txt_copy_to_clipboard"><![CDATA[Copy to Clipboard]]></string>
 </resources>
diff --git a/modules/boonex/russian/data/langs/bx_accounts/ru.xml b/modules/boonex/russian/data/langs/bx_accounts/ru.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
-	<string name="_bx_accnt"><![CDATA[Аккаунты]]></string>
-	<string name="_bx_accounts"><![CDATA[Аккаунты]]></string>
+    <string name="_bx_accnt"><![CDATA[Аккаунты]]></string>
+    <string name="_bx_accounts"><![CDATA[Аккаунты]]></string>
 
     <string name="_bx_accounts_form_display_account_settings_email_popup"><![CDATA[Изменить имейл]]></string>
     <string name="_bx_accounts_form_display_account_settings_password_popup"><![CDATA[Сбросить пароль]]></string>
 
-	<string name="_bx_accnt_page_title_sys_manage_administration"><![CDATA[Управление всеми аккаунтами]]></string>
-	<string name="_bx_accnt_page_title_manage"><![CDATA[Управление аккаунтами]]></string>
-	<string name="_bx_accnt_page_title_browse"><![CDATA[Аккаунты]]></string>
+    <string name="_bx_accnt_page_title_sys_manage_administration"><![CDATA[Управление всеми аккаунтами]]></string>
+    <string name="_bx_accnt_page_title_manage"><![CDATA[Управление аккаунтами]]></string>
+    <string name="_bx_accnt_page_title_browse"><![CDATA[Аккаунты]]></string>
 
-	<string name="_bx_accnt_page_block_title_system_manage_administration"><![CDATA[Управление всеми аккаунтами]]></string>
-	<string name="_bx_accnt_page_block_title_manage"><![CDATA[Управление аккаунтами]]></string>
+    <string name="_bx_accnt_page_block_title_system_manage_administration"><![CDATA[Управление всеми аккаунтами]]></string>
+    <string name="_bx_accnt_page_block_title_manage"><![CDATA[Управление аккаунтами]]></string>
 
-	<string name="_bx_accnt_menu_set_title_manage_tools"><![CDATA[Управление меню инструментов]]></string>
+    <string name="_bx_accnt_menu_set_title_manage_tools"><![CDATA[Управление меню инструментов]]></string>
     <string name="_bx_accnt_menu_title_manage_tools"><![CDATA[Управление меню инструментов]]></string>
     <string name="_bx_accnt_menu_item_title_system_edit_email"><![CDATA[Изменить имейл]]></string>
     <string name="_bx_accnt_menu_item_title_edit_email"><![CDATA[Изменить имейл]]></string>
@@ -27,30 +27,31 @@
     <string name="_bx_accnt_menu_item_title_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_accnt_menu_item_title_system_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_accnt_menu_item_title_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
-	<string name="_bx_accnt_menu_item_title_system_admt_accounts"><![CDATA[Аккаунты]]></string>
-	<string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Аккаунты - {addon} неподтверждено]]></string>
-	<string name="_bx_accnt_menu_item_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_accnt_menu_item_title_system_admt_accounts"><![CDATA[Аккаунты]]></string>
+    <string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Аккаунты - {addon} неподтверждено]]></string>
+    <string name="_bx_accnt_menu_item_title_manage"><![CDATA[Управление]]></string>
 
-	<string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Редактировать мой аккаунт]]></string>
+    <string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Редактировать мой аккаунт]]></string>
 
-	<string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-  <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Все]]></string>
-	<string name="_bx_accnt_grid_filter_item_title_adm_active"><![CDATA[Активный]]></string>
-  <string name="_bx_accnt_grid_filter_item_title_adm_operators"><![CDATA[Операторы]]></string>
-	<string name="_bx_accnt_grid_filter_item_title_adm_pending"><![CDATA[Неактивный]]></string>
-	<string name="_bx_accnt_grid_filter_item_title_adm_suspended"><![CDATA[Приостановленный]]></string>
-  <string name="_bx_accnt_grid_filter_item_title_adm_locked"><![CDATA[Заблокированный]]></string>
-
-  <string name="_bx_accnt_grid_column_title_adm_active"><![CDATA[Активный]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Все]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_active"><![CDATA[Активный]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_operators"><![CDATA[Операторы]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_pending"><![CDATA[Неактивный]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_suspended"><![CDATA[Приостановленный]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_unconfirmed"><![CDATA[Неподтверждённый]]></string>
+    <string name="_bx_accnt_grid_filter_item_title_adm_locked"><![CDATA[Заблокированный]]></string>
+
+    <string name="_bx_accnt_grid_column_title_adm_active"><![CDATA[Активный]]></string>
     <string name="_bx_accnt_grid_column_title_adm_name"><![CDATA[Имя]]></string>
     <string name="_bx_accnt_grid_column_title_adm_email"><![CDATA[Имейл]]></string>
-  <string name="_bx_accnt_grid_column_title_adm_ip"><![CDATA[IP]]></string>
+    <string name="_bx_accnt_grid_column_title_adm_ip"><![CDATA[IP]]></string>
     <string name="_bx_accnt_grid_column_title_adm_is_confirmed"><![CDATA[Подтверждён]]></string>
     <string name="_bx_accnt_grid_column_title_adm_profiles"><![CDATA[Профили]]></string>
     <string name="_bx_accnt_grid_column_title_adm_logged"><![CDATA[Последнее посещение]]></string>
     <string name="_bx_accnt_grid_action_title_adm_activate"><![CDATA[Активировать]]></string>
-	<string name="_bx_accnt_grid_action_title_adm_suspend"><![CDATA[Заблокировать]]></string>
-	<string name="_bx_accnt_grid_action_title_adm_edit_email"><![CDATA[Изменить имейл]]></string>
+    <string name="_bx_accnt_grid_action_title_adm_suspend"><![CDATA[Заблокировать]]></string>
+    <string name="_bx_accnt_grid_action_title_adm_edit_email"><![CDATA[Изменить имейл]]></string>
     <string name="_bx_accnt_grid_action_title_adm_resend_cemail"><![CDATA[Переслать подтверждение]]></string>
     <string name="_bx_accnt_grid_action_title_adm_reset_password"><![CDATA[Сбросить пароль]]></string>
     <string name="_bx_accnt_grid_action_title_adm_unlock_account"><![CDATA[Разблокировать]]></string>
@@ -66,7 +67,7 @@
     <string name="_bx_accnt_grid_confirmation_status_phone"><![CDATA[Телефон]]></string>
     <string name="_bx_accnt_grid_confirmation_status_email_and_phone"><![CDATA[Все]]></string>
 
-	<string name="_bx_accnt_txt_more"><![CDATA[{0} ещё]]></string>
-	<string name="_bx_accnt_txt_see_more"><![CDATA[Ещё]]></string>
-	<string name="_bx_accnt_txt_copy_to_clipboard"><![CDATA[Скопировать]]></string>
+    <string name="_bx_accnt_txt_more"><![CDATA[{0} ещё]]></string>
+    <string name="_bx_accnt_txt_see_more"><![CDATA[Ещё]]></string>
+    <string name="_bx_accnt_txt_copy_to_clipboard"><![CDATA[Скопировать]]></string>
 </resources>