#281 Groups: "top" page instead of "active" page

modules/base/profile/classes/BxBaseModProfileGridAdministration.php

@@ -151,6 +151,11 @@ class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministrat
         return parent::_getCellDefault(bx_time_js($mixedValue), $sKey, $aField, $aRow);
     }
 
+    protected function _getCellAddedTs($mixedValue, $sKey, $aField, $aRow)
+    {
+        return $this->_getCellLastOnline($mixedValue, $sKey, $aField, $aRow);
+    }
+
 	protected function _getCellAccount($mixedValue, $sKey, $aField, $aRow)
     {
     	$sManageAccountUrl = $this->_getManageAccountUrl($aRow[$sKey]);

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -212,6 +212,11 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolPro
         return $this->_serviceBrowse ('active', false, BX_DB_PADDING_DEF, $bDisplayEmptyMsg);
     }
 
+    public function serviceBrowseTopProfiles ($bDisplayEmptyMsg = false)
+    {
+        return $this->_serviceBrowse ('top', false, BX_DB_PADDING_DEF, $bDisplayEmptyMsg);
+    }
+    
 	public function serviceBrowseOnlineProfiles ($bDisplayEmptyMsg = false)
     {
         return $this->_serviceBrowse ('online', false, BX_DB_PADDING_DEF, $bDisplayEmptyMsg);

modules/boonex/groups/classes/BxGroupsSearchResult.php

@@ -121,11 +121,11 @@ class BxGroupsSearchResult extends BxBaseModProfileSearchResult
                 $this->sBrowseUrl = 'page.php?i=groups-home';
                 break;
 
-            case 'active':
+            case 'top':
                 $this->aCurrent['rss']['link'] = 'modules/?r=groups/rss/' . $sMode;
-                $this->aCurrent['title'] = _t('_bx_groups_page_title_browse_active');
-                $this->aCurrent['sorting'] = 'active';
-                $this->sBrowseUrl = 'page.php?i=groups-active';
+                $this->aCurrent['title'] = _t('_bx_groups_page_title_browse_top');
+                $this->aCurrent['sorting'] = 'top';
+                $this->sBrowseUrl = 'page.php?i=groups-top';
                 break;
 
             case '': // search results
@@ -163,6 +163,8 @@ class BxGroupsSearchResult extends BxBaseModProfileSearchResult
         switch ($this->aCurrent['sorting']) {
         case 'none':
             return array('order' => ' ORDER BY `sys_accounts`.`logged` DESC ');
+        case 'top':
+            return array('order' => ' ORDER BY `bx_groups_data`.`views` DESC ');
         case 'last':
         default:                        
             return array('order' => ' ORDER BY `bx_groups_data`.`added` DESC ');

modules/boonex/groups/install/langs/en.xml

@@ -61,7 +61,7 @@
 	<string name="_bx_groups_page_title_sys_view_profile"><![CDATA[View Group]]></string>
 	<string name="_bx_groups_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_groups_page_title_browse"><![CDATA[Groups]]></string>
-	<string name="_bx_groups_page_title_browse_active"><![CDATA[Active Groups]]></string>
+	<string name="_bx_groups_page_title_browse_top"><![CDATA[Top Groups]]></string>
 	<string name="_bx_groups_page_title_browse_recent"><![CDATA[New Groups]]></string>
 	<string name="_bx_groups_page_title_browse_connections"><![CDATA[{0} connections]]></string>
 	<string name="_bx_groups_page_title_browse_connections_mutual"><![CDATA[{0} and {1} mutual connections]]></string>
@@ -76,8 +76,8 @@
 	<string name="_bx_groups_page_title_sys_manage"><![CDATA[Manage Own Groups]]></string>
 	<string name="_bx_groups_page_title_sys_manage_administration"><![CDATA[Manage All Groups]]></string>
 	<string name="_bx_groups_page_title_manage"><![CDATA[Manage Groups]]></string>
-	<string name="_bx_groups_page_title_sys_active"><![CDATA[Active Groups]]></string>
-	<string name="_bx_groups_page_title_active"><![CDATA[Active Groups]]></string>
+	<string name="_bx_groups_page_title_sys_top"><![CDATA[Top Groups]]></string>
+	<string name="_bx_groups_page_title_top"><![CDATA[Top Groups]]></string>
 
 	<string name="_bx_groups_page_block_title_sys_joined_entries"><![CDATA[Joined Groups]]></string>
 	<string name="_bx_groups_page_block_title_joined_entries"><![CDATA[Joined Groups]]></string>
@@ -99,7 +99,7 @@
 	<string name="_bx_groups_page_block_title_system_manage"><![CDATA[Manage Own Groups]]></string>
 	<string name="_bx_groups_page_block_title_system_manage_administration"><![CDATA[Manage All Groups]]></string>
 	<string name="_bx_groups_page_block_title_manage"><![CDATA[Manage Groups]]></string>
-    <string name="_bx_groups_page_block_title_active_profiles"><![CDATA[Active Groups]]></string>
+    <string name="_bx_groups_page_block_title_top_profiles"><![CDATA[Top Groups]]></string>
     <string name="_bx_groups_page_block_title_entry_social_sharing"><![CDATA[Share]]></string>
 
     <string name="_bx_groups_page_block_title_categories"><![CDATA[Group categories]]></string>
@@ -182,8 +182,8 @@
 	<string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Groups - {addon} unapproved]]></string>
 	<string name="_bx_groups_menu_item_title_manage_my"><![CDATA[My Groups]]></string>
 	<string name="_bx_groups_menu_item_title_manage_all"><![CDATA[All Groups]]></string>
-	<string name="_bx_groups_menu_item_title_system_entries_active"><![CDATA[Active]]></string>
-	<string name="_bx_groups_menu_item_title_entries_active"><![CDATA[Active]]></string>
+	<string name="_bx_groups_menu_item_title_system_entries_top"><![CDATA[Top]]></string>
+	<string name="_bx_groups_menu_item_title_entries_top"><![CDATA[Top]]></string>
 
 	<string name="_bx_groups_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
 	<string name="_bx_groups_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
@@ -191,7 +191,7 @@
 	<string name="_bx_groups_grid_filter_item_title_adm_suspended"><![CDATA[Suspended]]></string>
 	<string name="_bx_groups_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_groups_grid_column_title_adm_group_name"><![CDATA[Name]]></string>
-    <string name="_bx_groups_grid_column_title_adm_last_online"><![CDATA[Last Online]]></string>
+    <string name="_bx_groups_grid_column_title_adm_added"><![CDATA[Created]]></string>
     <string name="_bx_groups_grid_column_title_adm_account"><![CDATA[Account]]></string>
     <string name="_bx_groups_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_groups_grid_action_title_adm_delete_with_content"><![CDATA[Delete With Content]]></string>

modules/boonex/groups/install/sql/disable.sql

@@ -10,7 +10,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 -- PAGES
 
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_groups';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_groups' OR `object` IN('bx_groups_create_profile', 'bx_groups_delete_profile', 'bx_groups_edit_profile', 'bx_groups_edit_profile_cover', 'bx_groups_view_profile', 'bx_groups_view_profile_closed', 'bx_groups_profile_info', 'bx_groups_home', 'bx_groups_fans', 'bx_groups_joined', 'bx_groups_active', 'bx_groups_manage', 'bx_groups_administration');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_groups' OR `object` IN('bx_groups_create_profile', 'bx_groups_delete_profile', 'bx_groups_edit_profile', 'bx_groups_edit_profile_cover', 'bx_groups_view_profile', 'bx_groups_view_profile_closed', 'bx_groups_profile_info', 'bx_groups_home', 'bx_groups_fans', 'bx_groups_joined', 'bx_groups_top', 'bx_groups_manage', 'bx_groups_administration');
 
 -- MENU
 

modules/boonex/groups/install/sql/enable.sql

@@ -91,13 +91,13 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
 ('bx_groups_home', 1, 'bx_groups', '_bx_groups_page_block_title_latest_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:9:\"bx_groups\";s:6:\"method\";s:22:\"browse_recent_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
 
--- PAGE: active profiles
+-- PAGE: top profiles
 
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_groups_active', '_bx_groups_page_title_sys_active', '_bx_groups_page_title_active', 'bx_groups', 5, 2147483647, 1, 'groups-active', 'page.php?i=groups-active', '', '', '', 0, 1, 0, 'BxGroupsPageBrowse', 'modules/boonex/groups/classes/BxGroupsPageBrowse.php');
+('bx_groups_top', '_bx_groups_page_title_sys_top', '_bx_groups_page_title_top', 'bx_groups', 5, 2147483647, 1, 'groups-top', 'page.php?i=groups-top', '', '', '', 0, 1, 0, 'BxGroupsPageBrowse', 'modules/boonex/groups/classes/BxGroupsPageBrowse.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
-('bx_groups_active', 1, 'bx_groups', '_bx_groups_page_block_title_active_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:9:\"bx_groups\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
+('bx_groups_top', 1, 'bx_groups', '_bx_groups_page_block_title_top_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:9:\"bx_groups\";s:6:\"method\";s:19:\"browse_top_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
 
 -- PAGE: module manage own
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -189,7 +189,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_groups_submenu', 'bx_groups', 'groups-home', '_bx_groups_menu_item_title_system_entries_recent', '_bx_groups_menu_item_title_entries_recent', 'page.php?i=groups-home', '', '', '', '', 2147483647, 1, 1, 1),
-('bx_groups_submenu', 'bx_groups', 'groups-active', '_bx_groups_menu_item_title_system_entries_active', '_bx_groups_menu_item_title_entries_active', 'page.php?i=groups-active', '', '', '', '', 2147483647, 1, 1, 2),
+('bx_groups_submenu', 'bx_groups', 'groups-top', '_bx_groups_menu_item_title_system_entries_top', '_bx_groups_menu_item_title_entries_top', 'page.php?i=groups-top', '', '', '', '', 2147483647, 1, 1, 2),
 ('bx_groups_submenu', 'bx_groups', 'groups-manage', '_bx_groups_menu_item_title_system_entries_manage', '_bx_groups_menu_item_title_entries_manage', 'page.php?i=groups-manage', '', '', '', '', 2147483646, 1, 1, 3);
 
 -- MENU: view submenu
@@ -341,19 +341,19 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `conf
 -- GRIDS: administration
 
 INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `field_id`, `field_order`, `field_active`, `paginate_url`, `paginate_per_page`, `paginate_simple`, `paginate_get_start`, `paginate_get_per_page`, `filter_fields`, `filter_fields_translatable`, `filter_mode`, `sorting_fields`, `sorting_fields_translatable`, `override_class_name`, `override_class_file`) VALUES
-('bx_groups_administration', 'Sql', 'SELECT `td`.*, `ta`.`email` AS `account`, `ta`.`logged` AS `last_online`, `tp`.`status` AS `status` FROM `bx_groups_data` AS `td` LEFT JOIN `sys_profiles` AS `tp` ON `td`.`id`=`tp`.`content_id` AND `tp`.`type`=''bx_groups'' LEFT JOIN `sys_accounts` AS `ta` ON `tp`.`account_id`=`ta`.`id` WHERE 1 ', 'bx_groups_data', 'id', 'last_online', 'status', '', 20, NULL, 'start', '', 'group_name', '', 'like', '', '', 'BxGroupsGridAdministration', 'modules/boonex/groups/classes/BxGroupsGridAdministration.php'),
-('bx_groups_common', 'Sql', 'SELECT `td`.*, `ta`.`email` AS `account`, `ta`.`logged` AS `last_online`, `tp`.`status` AS `status` FROM `bx_groups_data` AS `td` LEFT JOIN `sys_profiles` AS `tp` ON `td`.`id`=`tp`.`content_id` AND `tp`.`type`=''bx_groups'' LEFT JOIN `sys_accounts` AS `ta` ON `tp`.`account_id`=`ta`.`id` WHERE 1 ', 'bx_groups_data', 'id', 'last_online', 'status', '', 20, NULL, 'start', '', 'group_name', '', 'like', '', '', 'BxGroupsGridCommon', 'modules/boonex/groups/classes/BxGroupsGridCommon.php');
+('bx_groups_administration', 'Sql', 'SELECT `td`.*, `ta`.`email` AS `account`, `td`.`added` AS `added_ts`, `tp`.`status` AS `status` FROM `bx_groups_data` AS `td` LEFT JOIN `sys_profiles` AS `tp` ON `td`.`id`=`tp`.`content_id` AND `tp`.`type`=''bx_groups'' LEFT JOIN `sys_accounts` AS `ta` ON `tp`.`account_id`=`ta`.`id` WHERE 1 ', 'bx_groups_data', 'id', 'added', 'status', '', 20, NULL, 'start', '', 'group_name', '', 'like', '', '', 'BxGroupsGridAdministration', 'modules/boonex/groups/classes/BxGroupsGridAdministration.php'),
+('bx_groups_common', 'Sql', 'SELECT `td`.*, `ta`.`email` AS `account`, `ta`.`added` AS `added_ts`, `tp`.`status` AS `status` FROM `bx_groups_data` AS `td` LEFT JOIN `sys_profiles` AS `tp` ON `td`.`id`=`tp`.`content_id` AND `tp`.`type`=''bx_groups'' LEFT JOIN `sys_accounts` AS `ta` ON `tp`.`account_id`=`ta`.`id` WHERE 1 ', 'bx_groups_data', 'id', 'added', 'status', '', 20, NULL, 'start', '', 'group_name', '', 'like', '', '', 'BxGroupsGridCommon', 'modules/boonex/groups/classes/BxGroupsGridCommon.php');
 
 INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable`, `chars_limit`, `params`, `order`) VALUES
 ('bx_groups_administration', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_groups_administration', 'switcher', '_bx_groups_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_groups_administration', 'group_name', '_bx_groups_grid_column_title_adm_group_name', '25%', 0, '', '', 3),
-('bx_groups_administration', 'last_online', '_bx_groups_grid_column_title_adm_last_online', '20%', 1, '25', '', 4),
+('bx_groups_administration', 'added_ts', '_bx_groups_grid_column_title_adm_added', '20%', 1, '25', '', 4),
 ('bx_groups_administration', 'account', '_bx_groups_grid_column_title_adm_account', '25%', 0, '25', '', 5),
 ('bx_groups_administration', 'actions', '', '20%', 0, '', '', 6),
 ('bx_groups_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_groups_common', 'group_name', '_bx_groups_grid_column_title_adm_group_name', '48%', 0, '', '', 2),
-('bx_groups_common', 'last_online', '_bx_groups_grid_column_title_adm_last_online', '30%', 1, '25', '', 3),
+('bx_groups_common', 'added_ts', '_bx_groups_grid_column_title_adm_added', '30%', 1, '25', '', 3),
 ('bx_groups_common', 'actions', '', '20%', 0, '', '', 4);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES

modules/boonex/russian/data/langs/bx_groups/ru.xml

@@ -61,7 +61,7 @@
 	<string name="_bx_groups_page_title_sys_view_profile"><![CDATA[Просмотреть группу]]></string>
 	<string name="_bx_groups_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_groups_page_title_browse"><![CDATA[Группы]]></string>
-    <string name="_bx_groups_page_title_browse_active"><![CDATA[Последние Активные Группы]]></string>
+    <string name="_bx_groups_page_title_browse_top"><![CDATA[Популярные Группы]]></string>
 	<string name="_bx_groups_page_title_browse_recent"><![CDATA[Последние Добавленные Группы]]></string>
 	<string name="_bx_groups_page_title_browse_connections"><![CDATA[{0} связей]]></string>
 	<string name="_bx_groups_page_title_browse_connections_mutual"><![CDATA[{0} и {1} обоюдных связей]]></string>
@@ -76,8 +76,8 @@
 	<string name="_bx_groups_page_title_sys_manage"><![CDATA[Управление собственными группами]]></string>
 	<string name="_bx_groups_page_title_sys_manage_administration"><![CDATA[Управление всеми группами]]></string>
 	<string name="_bx_groups_page_title_manage"><![CDATA[Управление группами]]></string>
-	<string name="_bx_groups_page_title_sys_active"><![CDATA[Последние Активные Группы]]></string>
-	<string name="_bx_groups_page_title_active"><![CDATA[Последние Активные Группы]]></string>
+	<string name="_bx_groups_page_title_sys_top"><![CDATA[Популярные Группы]]></string>
+	<string name="_bx_groups_page_title_top"><![CDATA[Популярные Группы]]></string>
     <string name="_bx_groups_page_block_title_categories"><![CDATA[Категории групп]]></string>
 
 	<string name="_bx_groups_page_block_title_sys_joined_entries"><![CDATA[Участие в группах]]></string>
@@ -100,7 +100,7 @@
 	<string name="_bx_groups_page_block_title_system_manage"><![CDATA[Управление собственными группами]]></string>
 	<string name="_bx_groups_page_block_title_system_manage_administration"><![CDATA[Управление всеми группами]]></string>
 	<string name="_bx_groups_page_block_title_manage"><![CDATA[Управление группами]]></string>
-    <string name="_bx_groups_page_block_title_active_profiles"><![CDATA[Последние Активные Группы]]></string>
+    <string name="_bx_groups_page_block_title_top_profiles"><![CDATA[Популярные Группы]]></string>
     <string name="_bx_groups_page_block_title_entry_social_sharing"><![CDATA[Поделиться]]></string>
 
     <string name="_bx_groups_menu_title_submenu"><![CDATA[Группы - Подменю]]></string>
@@ -171,18 +171,18 @@
     <string name="_bx_groups_menu_item_title_friend_requests"><![CDATA[{addon} запросов дружбы]]></string>
     <string name="_bx_groups_menu_item_title_system_manage_my_groups"><![CDATA[Мои группы]]></string>
     <string name="_bx_groups_menu_item_title_manage_my_groups"><![CDATA[{addon} групп]]></string>
-    <string name="_bx_groups_menu_item_title_system_entries_recent"><![CDATA[Новые Группы]]></string>
-    <string name="_bx_groups_menu_item_title_entries_recent"><![CDATA[Новые Группы]]></string>
-    <string name="_bx_groups_menu_item_title_system_entries_manage"><![CDATA[Управление Группами]]></string>
-    <string name="_bx_groups_menu_item_title_entries_manage"><![CDATA[Управление Группами]]></string>
+    <string name="_bx_groups_menu_item_title_system_entries_recent"><![CDATA[Новые]]></string>
+    <string name="_bx_groups_menu_item_title_entries_recent"><![CDATA[Новые]]></string>
+    <string name="_bx_groups_menu_item_title_system_entries_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_groups_menu_item_title_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_groups_menu_item_title_system_entries_home"><![CDATA[Группы]]></string>
     <string name="_bx_groups_menu_item_title_entries_home"><![CDATA[Группы]]></string>
     <string name="_bx_groups_menu_item_title_system_admt_groups"><![CDATA[Группы]]></string>
 	<string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Группы - {addon} неодобрено]]></string>
 	<string name="_bx_groups_menu_item_title_manage_my"><![CDATA[Мои группы]]></string>
 	<string name="_bx_groups_menu_item_title_manage_all"><![CDATA[Все группы]]></string>
-	<string name="_bx_groups_menu_item_title_system_entries_active"><![CDATA[Активные Группы]]></string>
-	<string name="_bx_groups_menu_item_title_entries_active"><![CDATA[Активные Группы]]></string>
+	<string name="_bx_groups_menu_item_title_system_entries_top"><![CDATA[Популярные]]></string>
+	<string name="_bx_groups_menu_item_title_entries_top"><![CDATA[Популярные]]></string>
 
 	<string name="_bx_groups_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
 	<string name="_bx_groups_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
@@ -190,7 +190,7 @@
 	<string name="_bx_groups_grid_filter_item_title_adm_suspended"><![CDATA[Заблокированные]]></string>
 	<string name="_bx_groups_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_groups_grid_column_title_adm_group_name"><![CDATA[Название]]></string>
-    <string name="_bx_groups_grid_column_title_adm_last_online"><![CDATA[Последнее посещение]]></string>
+    <string name="_bx_groups_grid_column_title_adm_added"><![CDATA[Создание]]></string>
     <string name="_bx_groups_grid_column_title_adm_account"><![CDATA[Аккаунт]]></string>
     <string name="_bx_groups_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_groups_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>