#281 Groups:

- don't set group as profile after group creation
- remove "Set Membership" and related staff
- description field is showing twice
- updated categories

modules/base/profile/classes/BxBaseModProfileFormsEntryHelper.php

@@ -19,7 +19,7 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
     public function __construct($oModule)
     {
         parent::__construct($oModule);
-        $this->setAutoApproval((bool)getParam($oModule->_oConfig->CNF['PARAM_AUTOAPPROVAL']));
+        $this->setAutoApproval(isset($oModule->_oConfig->CNF['PARAM_AUTOAPPROVAL']) ? (bool)getParam($oModule->_oConfig->CNF['PARAM_AUTOAPPROVAL']) : true);
     }
 
     public function isAutoApproval()
@@ -111,15 +111,18 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
             $oProfile->approve(BX_PROFILE_ACTION_AUTO);
 
         // set created profile some default membership
-        $iAclLevel = isAdmin() ? MEMBERSHIP_ID_ADMINISTRATOR : getParam($CNF['PARAM_DEFAULT_ACL_LEVEL']);
+        $iAclLevel = !isset($CNF['PARAM_DEFAULT_ACL_LEVEL']) ? MEMBERSHIP_ID_STANDARD : 
+            (isAdmin() ? MEMBERSHIP_ID_ADMINISTRATOR : getParam($CNF['PARAM_DEFAULT_ACL_LEVEL']));
         BxDolAcl::getInstance()->setMembership($iProfileId, $iAclLevel, 0, true);
 
         // alert
         bx_alert($this->_oModule->getName(), 'added', $iContentId);
 
         // switch context to the created profile
-        $oAccount = BxDolAccount::getInstance($iAccountId);
-        $oAccount->updateProfileContext($iProfileId);
+        if ($this->_oModule->serviceActAsProfile()) {
+            $oAccount = BxDolAccount::getInstance($iAccountId);
+            $oAccount->updateProfileContext($iProfileId);
+        }
 
         return '';
     }

modules/boonex/groups/classes/BxGroupsConfig.php

@@ -24,7 +24,6 @@ class BxGroupsConfig extends BxBaseModProfileConfig
             'profile-subscribe-add' => 'checkAllowedSubscribeAdd',
             'profile-subscribe-remove' => 'checkAllowedSubscribeRemove',
             'profile-actions-more' => 'checkAllowedViewMoreMenu',
-            'profile-set-acl-level' => 'checkAllowedSetMembership',
         );
 
         $this->CNF = array (
@@ -58,9 +57,6 @@ class BxGroupsConfig extends BxBaseModProfileConfig
         	'URL_MANAGE_COMMON' => 'page.php?i=groups-manage',
         	'URL_MANAGE_ADMINISTRATION' => 'page.php?i=groups-administration',
 
-            // some params
-            'PARAM_AUTOAPPROVAL' => 'bx_groups_autoapproval',
-            'PARAM_DEFAULT_ACL_LEVEL' => 'bx_groups_default_acl_level',
             'PARAM_NUM_RSS' => 'bx_groups_num_rss',
             'PARAM_NUM_CONNECTIONS_QUICK' => 'bx_groups_num_connections_quick',
 

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

@@ -3,8 +3,6 @@
 
 	<string name="_bx_groups"><![CDATA[Groups]]></string>
 
-	<string name="_bx_groups_option_autoapproval"><![CDATA[Activate all groups after creation automatically]]></string>
-	<string name="_bx_groups_option_default_acl_level"><![CDATA[Default level to assign after group creation]]></string>
 	<string name="_bx_groups_option_num_connections_quick"><![CDATA[Number of items in friends block]]></string>
 	<string name="_bx_groups_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
 
@@ -18,8 +16,8 @@
     <string name="_bx_groups_form_profile_input_sys_group_name"><![CDATA[Group Name]]></string>
     <string name="_bx_groups_form_profile_input_group_name"><![CDATA[Group Name]]></string>
     <string name="_bx_groups_form_profile_input_group_name_err"><![CDATA[This information is essential. Please, fill in this field.]]></string>
-    <string name="_bx_groups_form_profile_input_sys_group_name"><![CDATA[Description]]></string>
-    <string name="_bx_groups_form_profile_input_group_name"><![CDATA[Description]]></string>
+    <string name="_bx_groups_form_profile_input_sys_group_desc"><![CDATA[Description]]></string>
+    <string name="_bx_groups_form_profile_input_group_desc"><![CDATA[Description]]></string>
     <string name="_bx_groups_form_profile_input_sys_group_cat"><![CDATA[Category]]></string>
 	<string name="_bx_groups_form_profile_input_group_cat"><![CDATA[Category]]></string>
     <string name="_bx_groups_form_profile_input_group_cat_err"><![CDATA[Category field is mandatory]]></string>
@@ -180,7 +178,6 @@
     <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>
-    <string name="_bx_groups_grid_action_title_adm_set_acl_level"><![CDATA[Set Membership]]></string>
     <string name="_bx_groups_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
 	<string name="_bx_groups_grid_action_err_delete"><![CDATA[Cannot delete the selected group(s).]]></string>
 	<string name="_bx_groups_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
@@ -189,41 +186,12 @@
     <string name="_bx_groups_txt_account_suspended"><![CDATA[This group is suspended.]]></string>
 
     <string name="_bx_groups_pre_lists_cats"><![CDATA[Group categories]]></string>
-    <string name="_bx_groups_cat_Agriculture"><![CDATA[Agriculture]]></string>
-    <string name="_bx_groups_cat_Financial"><![CDATA[Financial]]></string>
-    <string name="_bx_groups_cat_Biotech"><![CDATA[Biotech]]></string>
-    <string name="_bx_groups_cat_Cause"><![CDATA[Cause]]></string>
-    <string name="_bx_groups_cat_Chemical"><![CDATA[Chemical]]></string>
-    <string name="_bx_groups_cat_Religious"><![CDATA[Religious]]></string>
-    <string name="_bx_groups_cat_Community"><![CDATA[Community]]></string>
-    <string name="_bx_groups_cat_Company"><![CDATA[Company]]></string>
-    <string name="_bx_groups_cat_Entertainment"><![CDATA[Entertainment]]></string>
-    <string name="_bx_groups_cat_Technology"><![CDATA[Technology]]></string>
-    <string name="_bx_groups_cat_Consulting"><![CDATA[Consulting]]></string>
-    <string name="_bx_groups_cat_Education"><![CDATA[Education]]></string>
-    <string name="_bx_groups_cat_Energy"><![CDATA[Energy]]></string>
-    <string name="_bx_groups_cat_Engineering"><![CDATA[Engineering]]></string>
-    <string name="_bx_groups_cat_Food"><![CDATA[Food]]></string>
-    <string name="_bx_groups_cat_Government"><![CDATA[Government]]></string>
-    <string name="_bx_groups_cat_Health"><![CDATA[Health]]></string>
-    <string name="_bx_groups_cat_Medical"><![CDATA[Medical]]></string>
-    <string name="_bx_groups_cat_Industrial"><![CDATA[Industrial]]></string>
-    <string name="_bx_groups_cat_Insurance"><![CDATA[Insurance]]></string>
-    <string name="_bx_groups_cat_Internet"><![CDATA[Internet]]></string>
-    <string name="_bx_groups_cat_Software"><![CDATA[Software]]></string>
-    <string name="_bx_groups_cat_Legal"><![CDATA[Legal]]></string>
-    <string name="_bx_groups_cat_Media"><![CDATA[Media]]></string>
-    <string name="_bx_groups_cat_School"><![CDATA[School]]></string>
-    <string name="_bx_groups_cat_NGO"><![CDATA[NGO]]></string>
-    <string name="_bx_groups_cat_NPO"><![CDATA[NPO]]></string>
-    <string name="_bx_groups_cat_Political"><![CDATA[Political]]></string>
-    <string name="_bx_groups_cat_Retail"><![CDATA[Retail]]></string>
-    <string name="_bx_groups_cat_Small_Business"><![CDATA[Small Business]]></string>
-    <string name="_bx_groups_cat_Telecommunication"><![CDATA[Telecommunication]]></string>
-    <string name="_bx_groups_cat_Transport"><![CDATA[Transport]]></string>
-    <string name="_bx_groups_cat_Travel"><![CDATA[Travel]]></string>
-    <string name="_bx_groups_cat_University"><![CDATA[University]]></string>
-    <string name="_bx_groups_cat_Other"><![CDATA[Other]]></string>
+    <string name="_bx_groups_cat_General"><![CDATA[General]]></string>
+    <string name="_bx_groups_cat_Business"><![CDATA[Business]]></string>
+    <string name="_bx_groups_cat_Interests"><![CDATA[Interests]]></string>
+    <string name="_bx_groups_cat_Causes"><![CDATA[Causes]]></string>
+    <string name="_bx_groups_cat_Fun"><![CDATA[Fun]]></string>
+    <string name="_bx_groups_cat_Uncategorised"><![CDATA[Uncategorised]]></string>
 
     <string name="_bx_groups_txt_sample_single"><![CDATA[group]]></string>
 </resources>

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

@@ -3,8 +3,6 @@
 
 	<string name="_bx_groups"><![CDATA[Группы]]></string>
 
-	<string name="_bx_groups_option_autoapproval"><![CDATA[Автоматически активировать все группы после создания]]></string>
-	<string name="_bx_groups_option_default_acl_level"><![CDATA[Уровень, назначаемый созданной группе по умолчанию]]></string>
 	<string name="_bx_groups_option_num_connections_quick"><![CDATA[Число элементов в блоке друзей]]></string>
 	<string name="_bx_groups_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
 
@@ -18,8 +16,8 @@
     <string name="_bx_groups_form_profile_input_sys_group_name"><![CDATA[Название группы]]></string>
     <string name="_bx_groups_form_profile_input_group_name"><![CDATA[Название группы]]></string>
     <string name="_bx_groups_form_profile_input_group_name_err"><![CDATA[Эта информация необходима. Пожалуйста, заполните это поле.]]></string>
-    <string name="_bx_groups_form_profile_input_sys_group_name"><![CDATA[Описание]]></string>
-    <string name="_bx_groups_form_profile_input_group_name"><![CDATA[Описание]]></string>
+    <string name="_bx_groups_form_profile_input_sys_group_desc"><![CDATA[Описание]]></string>
+    <string name="_bx_groups_form_profile_input_group_desc"><![CDATA[Описание]]></string>
     <string name="_bx_groups_form_profile_input_sys_group_cat"><![CDATA[Категория]]></string>
 	<string name="_bx_groups_form_profile_input_group_cat"><![CDATA[Категория]]></string>
     <string name="_bx_groups_form_profile_input_group_cat_err"><![CDATA[Поле категории необходимо]]></string>
@@ -179,7 +177,6 @@
     <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>
-    <string name="_bx_groups_grid_action_title_adm_set_acl_level"><![CDATA[Назначить членство]]></string>
     <string name="_bx_groups_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
 	<string name="_bx_groups_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) группу(ы).]]></string>
 	<string name="_bx_groups_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
@@ -188,41 +185,12 @@
     <string name="_bx_groups_txt_account_suspended"><![CDATA[Эта группа заблокирована.]]></string>
 
     <string name="_bx_groups_pre_lists_cats"><![CDATA[Категории групп]]></string>
-    <string name="_bx_groups_cat_Agriculture"><![CDATA[Сельское хозяйство]]></string>
-    <string name="_bx_groups_cat_Financial"><![CDATA[Финансы]]></string>
-    <string name="_bx_groups_cat_Biotech"><![CDATA[Биотехнологии]]></string>
-    <string name="_bx_groups_cat_Cause"><![CDATA[Дело]]></string>
-    <string name="_bx_groups_cat_Chemical"><![CDATA[Химия]]></string>
-    <string name="_bx_groups_cat_Religious"><![CDATA[Религия]]></string>
-    <string name="_bx_groups_cat_Community"><![CDATA[Общество]]></string>
-    <string name="_bx_groups_cat_Company"><![CDATA[Компания]]></string>
-    <string name="_bx_groups_cat_Entertainment"><![CDATA[Развлечения]]></string>
-    <string name="_bx_groups_cat_Technology"><![CDATA[Технологии]]></string>
-    <string name="_bx_groups_cat_Consulting"><![CDATA[Консультации]]></string>
-    <string name="_bx_groups_cat_Education"><![CDATA[Образование]]></string>
-    <string name="_bx_groups_cat_Energy"><![CDATA[Энергетика]]></string>
-    <string name="_bx_groups_cat_Engineering"><![CDATA[Инженерия]]></string>
-    <string name="_bx_groups_cat_Food"><![CDATA[Питание]]></string>
-    <string name="_bx_groups_cat_Government"><![CDATA[Правительство]]></string>
-    <string name="_bx_groups_cat_Health"><![CDATA[Здоровье]]></string>
-    <string name="_bx_groups_cat_Medical"><![CDATA[Медицина]]></string>
-    <string name="_bx_groups_cat_Industrial"><![CDATA[Промышленность]]></string>
-    <string name="_bx_groups_cat_Insurance"><![CDATA[Страхование]]></string>
-    <string name="_bx_groups_cat_Internet"><![CDATA[Интернет]]></string>
-    <string name="_bx_groups_cat_Software"><![CDATA[Программное обеспечение]]></string>
-    <string name="_bx_groups_cat_Legal"><![CDATA[Право]]></string>
-    <string name="_bx_groups_cat_Media"><![CDATA[СМИ]]></string>
-    <string name="_bx_groups_cat_School"><![CDATA[Школа]]></string>
-    <string name="_bx_groups_cat_NGO"><![CDATA[НПО]]></string>
-    <string name="_bx_groups_cat_NPO"><![CDATA[NPO]]></string>
-    <string name="_bx_groups_cat_Political"><![CDATA[Политика]]></string>
-    <string name="_bx_groups_cat_Retail"><![CDATA[Торговля]]></string>
-    <string name="_bx_groups_cat_Small_Business"><![CDATA[Малый бизнес]]></string>
-    <string name="_bx_groups_cat_Telecommunication"><![CDATA[Телекоммуникации]]></string>
-    <string name="_bx_groups_cat_Transport"><![CDATA[Транспорт]]></string>
-    <string name="_bx_groups_cat_Travel"><![CDATA[Путешествия]]></string>
-    <string name="_bx_groups_cat_University"><![CDATA[Преподавание]]></string>
-    <string name="_bx_groups_cat_Other"><![CDATA[Другое]]></string>
+    <string name="_bx_groups_cat_General"><![CDATA[Обобщение]]></string>
+    <string name="_bx_groups_cat_Business"><![CDATA[Бизнес]]></string>
+    <string name="_bx_groups_cat_Interests"><![CDATA[Увлечение]]></string>
+    <string name="_bx_groups_cat_Causes"><![CDATA[Движение]]></string>
+    <string name="_bx_groups_cat_Fun"><![CDATA[Юмор]]></string>
+    <string name="_bx_groups_cat_Uncategorised"><![CDATA[Без категории]]></string>
 
     <string name="_bx_groups_txt_sample_single"><![CDATA[Группа]]></string>
 </resources>

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

@@ -11,8 +11,6 @@ VALUES (@iTypeId, 'bx_groups', '_bx_groups', 1);
 SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-('bx_groups_autoapproval', 'on', @iCategId, '_bx_groups_option_autoapproval', 'checkbox', '', '', '', 1),
-('bx_groups_default_acl_level', '3', @iCategId, '_bx_groups_option_default_acl_level', 'select', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"get_memberships";s:6:"params";a:2:{i:0;b:0;i:1;b:1;}s:5:"class";s:16:"TemplAclServices";}', '', '', 2),
 ('bx_groups_num_connections_quick', '4', @iCategId, '_bx_groups_option_num_connections_quick', 'digit', '', '', '', 10),
 ('bx_groups_num_rss', '10', @iCategId, '_bx_groups_option_num_rss', 'digit', '', '', '', 12);
 
@@ -157,7 +155,6 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_groups_view_actions', 'bx_groups', 'profile-fan-add', '_bx_groups_menu_item_title_system_become_fan', '{title_add_fan}', 'javascript:void(0)', 'bx_conn_action(this, \'bx_groups_fans\', \'add\', \'{content_id}\')', '', 'user-plus', '', 0, 2147483647, 1, 0, 5),
 -- ('bx_groups_view_actions', 'bx_groups', 'profile-friend-add', '_bx_groups_menu_item_title_system_befriend', '{title_add_friend}', 'javascript:void(0)', 'bx_conn_action(this, \'sys_profiles_friends\', \'add\', \'{profile_id}\')', '', 'user-plus', '', 0, 2147483647, 1, 0, 10),
 ('bx_groups_view_actions', 'bx_groups', 'profile-subscribe-add', '_bx_groups_menu_item_title_system_subscribe', '_bx_groups_menu_item_title_subscribe', 'javascript:void(0)', 'bx_conn_action(this, \'sys_profiles_subscriptions\', \'add\', \'{profile_id}\')', '', 'check', '', 0, 2147483647, 1, 0, 20),
-('bx_groups_view_actions', 'bx_groups', 'profile-set-acl-level', '_sys_menu_item_title_system_set_acl_level', '_sys_menu_item_title_set_acl_level', 'javascript:void(0)', 'bx_menu_popup(''sys_set_acl_level'', window, {}, {profile_id: {profile_id}});', '', 'certificate', '', 0, 192, 1, 0, 30),
 ('bx_groups_view_actions', 'bx_groups', 'profile-actions-more', '_bx_groups_menu_item_title_system_more_actions', '_bx_groups_menu_item_title_more_actions', 'javascript:void(0)', 'bx_menu_popup(''bx_groups_view_actions_more'', this, {}, {profile_id:{profile_id}});', '', 'cog', 'bx_groups_view_actions_more', 1, 2147483647, 1, 0, 9999);
 
 -- MENU: view actions more
@@ -348,10 +345,8 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_groups_common', 'actions', '', '20%', 0, '', '', 4);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
-('bx_groups_administration', 'bulk', 'set_acl_level', '_bx_groups_grid_action_title_adm_set_acl_level', '', 0, 0, 1),
 ('bx_groups_administration', 'bulk', 'delete', '_bx_groups_grid_action_title_adm_delete', '', 0, 1, 2),
 ('bx_groups_administration', 'bulk', 'delete_with_content', '_bx_groups_grid_action_title_adm_delete_with_content', '', 0, 1, 3),
-('bx_groups_administration', 'single', 'set_acl_level', '_bx_groups_grid_action_title_adm_set_acl_level', 'certificate', 1, 0, 1),
 ('bx_groups_administration', 'single', 'settings', '_bx_groups_grid_action_title_adm_more_actions', 'cog', 1, 0, 2),
 ('bx_groups_common', 'bulk', 'delete', '_bx_groups_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_groups_common', 'bulk', 'delete_with_content', '_bx_groups_grid_action_title_adm_delete_with_content', '', 0, 1, 2),

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

@@ -116,7 +116,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_group', 'bx_groups', 'cover_preview', '', '', 0, 'custom', '_bx_groups_form_profile_input_sys_cover_preview', '_bx_groups_form_profile_input_cover_preview', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_group', 'bx_groups', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_groups_form_profile_input_sys_delete_confirm', '_bx_groups_form_profile_input_delete_confirm', '_bx_groups_form_profile_input_delete_confirm_info', 1, 0, 0, '', '', '', 'avail', '', '_bx_groups_form_profile_input_delete_confirm_error', '', '', 1, 0),
 ('bx_group', 'bx_groups', 'do_submit', '_sys_form_account_input_submit', '', 0, 'submit', '_bx_groups_form_profile_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_group', 'bx_groups', 'group_desc', '', '', 0, 'textarea', '_bx_groups_form_profile_input_sys_group_name', '_bx_groups_form_profile_input_group_name', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 1),
+('bx_group', 'bx_groups', 'group_desc', '', '', 0, 'textarea', '_bx_groups_form_profile_input_sys_group_desc', '_bx_groups_form_profile_input_group_desc', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 1),
 ('bx_group', 'bx_groups', 'group_cat', '', '#!bx_groups_cats', 0, 'select', '_bx_groups_form_profile_input_sys_group_cat', '_bx_groups_form_profile_input_group_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_groups_form_profile_input_group_cat_err', 'Xss', '', 1, 1),
 ('bx_group', 'bx_groups', 'group_name', '', '', 0, 'text', '_bx_groups_form_profile_input_sys_group_name', '_bx_groups_form_profile_input_group_name', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_groups_form_profile_input_group_name_err', 'Xss', '', 1, 0),
 ('bx_group', 'bx_groups', 'picture', '', '', 0, 'file', '_bx_groups_form_profile_input_sys_picture', '_bx_groups_form_profile_input_picture', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_groups_form_profile_input_picture_err', 'Int', '', 1, 0),
@@ -174,41 +174,12 @@ INSERT INTO `sys_form_pre_lists`(`key`, `title`, `module`, `use_for_sets`) VALUE
 
 INSERT INTO `sys_form_pre_values`(`Key`, `Value`, `Order`, `LKey`, `LKey2`) VALUES
 ('bx_groups_cats', '', 0, '_sys_please_select', ''),
-('bx_groups_cats', '1', 1, '_bx_groups_cat_Agriculture', ''),
-('bx_groups_cats', '2', 2, '_bx_groups_cat_Financial', ''),
-('bx_groups_cats', '3', 3, '_bx_groups_cat_Biotech', ''),
-('bx_groups_cats', '4', 4, '_bx_groups_cat_Cause', ''),
-('bx_groups_cats', '5', 5, '_bx_groups_cat_Chemical', ''),
-('bx_groups_cats', '6', 6, '_bx_groups_cat_Religious', ''),
-('bx_groups_cats', '7', 7, '_bx_groups_cat_Community', ''),
-('bx_groups_cats', '8', 8, '_bx_groups_cat_Company', ''),
-('bx_groups_cats', '9', 9, '_bx_groups_cat_Entertainment', ''),
-('bx_groups_cats', '10', 10, '_bx_groups_cat_Technology', ''),
-('bx_groups_cats', '11', 11, '_bx_groups_cat_Consulting', ''),
-('bx_groups_cats', '12', 12, '_bx_groups_cat_Education', ''),
-('bx_groups_cats', '13', 13, '_bx_groups_cat_Energy', ''),
-('bx_groups_cats', '14', 14, '_bx_groups_cat_Engineering', ''),
-('bx_groups_cats', '15', 15, '_bx_groups_cat_Food', ''),
-('bx_groups_cats', '16', 16, '_bx_groups_cat_Government', ''),
-('bx_groups_cats', '17', 17, '_bx_groups_cat_Health', ''),
-('bx_groups_cats', '18', 18, '_bx_groups_cat_Medical', ''),
-('bx_groups_cats', '19', 19, '_bx_groups_cat_Industrial', ''),
-('bx_groups_cats', '20', 20, '_bx_groups_cat_Insurance', ''),
-('bx_groups_cats', '21', 21, '_bx_groups_cat_Internet', ''),
-('bx_groups_cats', '22', 22, '_bx_groups_cat_Software', ''),
-('bx_groups_cats', '23', 23, '_bx_groups_cat_Legal', ''),
-('bx_groups_cats', '24', 24, '_bx_groups_cat_Media', ''),
-('bx_groups_cats', '25', 25, '_bx_groups_cat_School', ''),
-('bx_groups_cats', '26', 26, '_bx_groups_cat_NGO', ''),
-('bx_groups_cats', '27', 27, '_bx_groups_cat_NPO', ''),
-('bx_groups_cats', '28', 28, '_bx_groups_cat_Political', ''),
-('bx_groups_cats', '29', 29, '_bx_groups_cat_Retail', ''),
-('bx_groups_cats', '30', 30, '_bx_groups_cat_Small_Business', ''),
-('bx_groups_cats', '31', 31, '_bx_groups_cat_Telecommunication', ''),
-('bx_groups_cats', '32', 32, '_bx_groups_cat_Transport', ''),
-('bx_groups_cats', '33', 33, '_bx_groups_cat_Travel', ''),
-('bx_groups_cats', '34', 34, '_bx_groups_cat_University', ''),
-('bx_groups_cats', '35', 35, '_bx_groups_cat_Other', '');
+('bx_groups_cats', '1', 1, '_bx_groups_cat_General', ''),
+('bx_groups_cats', '2', 2, '_bx_groups_cat_Business', ''),
+('bx_groups_cats', '3', 3, '_bx_groups_cat_Interests', ''),
+('bx_groups_cats', '4', 4, '_bx_groups_cat_Causes', ''),
+('bx_groups_cats', '5', 5, '_bx_groups_cat_Fun', ''),
+('bx_groups_cats', '6', 6, '_bx_groups_cat_Uncategorised', '');
 
 -- STUDIO PAGE & WIDGET