Merge branch 'master' of github.com:boonex/dolphin

inc/classes/BxDolModuleQuery.php

@@ -139,6 +139,9 @@ class BxDolModuleQuery extends BxDolDb implements iBxDolSingleton
 
             	$sWhereClause .= " AND `path`=:path AND `uri`=:uri";
             	break;
+
+            case 'all':
+            	break;
         }
 
         if(isset($aParams['active'])) {

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -129,6 +129,14 @@ class BxBaseModGeneralModule extends BxDolModule
         return $this->_serviceEntityForm ('viewDataForm', $iContentId);
     }
 
+	public function serviceEntityInfoFull ($iContentId = 0)
+    {
+    	$CNF = &$this->_oConfig->CNF;
+
+    	$sDisplayName = 'OBJECT_FORM_ENTRY_DISPLAY_VIEW_FULL';
+        return $this->_serviceEntityForm ('viewDataForm', $iContentId, !empty($CNF[$sDisplayName]) ? $CNF[$sDisplayName] : false);
+    }
+
 	public function serviceEntityInfoExtended ($iContentId = 0)
     {
         return $this->_serviceTemplateFunc ('entryInfo', $iContentId);

modules/base/notifications/classes/BxBaseModNotificationsInstaller.php

@@ -34,7 +34,7 @@ class BxBaseModNotificationsInstaller extends BxBaseModGeneralInstaller
 
     protected function _processHandlers($sAction)
     {
-    	$aModules = $this->oDb->getModules();
+    	$aModules = $this->oDb->getModulesBy(array('type' => 'all', 'active' => 1));
 	    foreach($aModules as $aModule) {
 	    	$aConfig = self::getModuleConfig($aModule);
 			if(!empty($aConfig['relations']) && is_array($aConfig['relations']) && in_array($this->_aConfig['name'], $aConfig['relations']))

modules/boonex/acl/template/pm_actions.html

@@ -1,4 +1,7 @@
 <p class="acl-dbd-membership-actions bx-def-font-align-center">
 	<a class="bx-btn bx-btn-small" href="__url_upgrade__"><bx_text:_bx_acl_txt_upgrade /></a>
-	<a class="bx-btn bx-btn-small" href="javascript:void(0)" onclick="javascript:alert('TODO: It should do something but I do not know what exactly.')"><bx_text:_bx_acl_txt_manage /></a>
+	<!--
+	TODO: A link to our own Manage tool or some manager from Payment Provider should be here.   
+	<a class="bx-btn bx-btn-small" href="javascript:void(0)"><bx_text:_bx_acl_txt_manage /></a>
+	-->
 </p>

modules/boonex/groups/classes/BxGroupsConfig.php

@@ -80,6 +80,7 @@ class BxGroupsConfig extends BxBaseModProfileConfig
             'OBJECT_METATAGS' => 'bx_groups',
             'OBJECT_FORM_ENTRY' => 'bx_group',
             'OBJECT_FORM_ENTRY_DISPLAY_VIEW' => 'bx_group_view',
+        	'OBJECT_FORM_ENTRY_DISPLAY_VIEW_FULL' => 'bx_group_view_full', // for "info" tab on view group page
             'OBJECT_FORM_ENTRY_DISPLAY_ADD' => 'bx_group_add',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_group_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT_COVER' => 'bx_group_edit_cover',

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

@@ -12,6 +12,7 @@
 	<string name="_bx_groups_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
 	<string name="_bx_groups_form_profile_display_delete"><![CDATA[Delete Group]]></string>
 	<string name="_bx_groups_form_profile_display_view"><![CDATA[View Group]]></string>
+	<string name="_bx_groups_form_profile_display_view_full"><![CDATA[Full View Group]]></string>
 	<string name="_bx_groups_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_groups_form_profile_input_sys_join_confirm"><![CDATA[Join confirmation]]></string>
     <string name="_bx_groups_form_profile_input_join_confirm"><![CDATA[Join confirmation]]></string>

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

@@ -74,7 +74,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_groups_profile_info', 'group-profile-info', '_bx_groups_page_title_sys_profile_info', '_bx_groups_page_title_profile_info', 'bx_groups', 5, 2147483647, 1, 'page.php?i=group-profile-info', '', '', '', 0, 1, 0, 'BxGroupsPageEntry', 'modules/boonex/groups/classes/BxGroupsPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_groups_profile_info', 1, 'bx_groups', '_bx_groups_page_block_title_system_profile_info', '_bx_groups_page_block_title_profile_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_groups\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 1);
+('bx_groups_profile_info', 1, 'bx_groups', '_bx_groups_page_block_title_system_profile_info', '_bx_groups_page_block_title_profile_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_groups\";s:6:\"method\";s:16:\"entity_info_full\";}', 0, 0, 1, 1),
+('bx_groups_profile_info', 1, 'bx_groups', '', '_bx_groups_page_block_title_profile_description', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_groups\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 2);
 
 -- PAGE: group fans
 

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

@@ -161,7 +161,8 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_group', 'bx_group_delete', 'bx_groups', 0, '_bx_groups_form_profile_display_delete'),
 ('bx_group', 'bx_group_edit', 'bx_groups', 0, '_bx_groups_form_profile_display_edit'),
 ('bx_group', 'bx_group_edit_cover', 'bx_groups', 0, '_bx_groups_form_profile_display_edit_cover'),
-('bx_group', 'bx_group_view', 'bx_groups', 1, '_bx_groups_form_profile_display_view');
+('bx_group', 'bx_group_view', 'bx_groups', 1, '_bx_groups_form_profile_display_view'),
+('bx_group', 'bx_group_view_full', 'bx_groups', 1, '_bx_groups_form_profile_display_view_full');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
 ('bx_group', 'bx_groups', 'allow_view_to', 3, '', 0, 'custom', '_bx_groups_form_profile_input_sys_allow_view_to', '_bx_groups_form_profile_input_allow_view_to', '_bx_groups_form_profile_input_allow_view_to_desc', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
@@ -186,12 +187,14 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_group_add', 'join_confirmation', 2147483647, 1, 10),
 ('bx_group_add', 'allow_view_to', 2147483647, 1, 11),
 ('bx_group_add', 'do_submit', 2147483647, 1, 12),
+
 ('bx_group_delete', 'delete_confirm', 2147483647, 1, 0),
 ('bx_group_delete', 'cover', 2147483647, 0, 0),
 ('bx_group_delete', 'picture', 2147483647, 0, 0),
 ('bx_group_delete', 'do_submit', 2147483647, 1, 1),
 ('bx_group_delete', 'group_name', 2147483647, 0, 2),
 ('bx_group_delete', 'group_cat', 2147483647, 0, 3),
+
 ('bx_group_edit', 'delete_confirm', 2147483647, 0, 2),
 ('bx_group_edit', 'cover', 2147483647, 0, 3),
 ('bx_group_edit', 'picture', 2147483647, 1, 5),
@@ -201,6 +204,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_group_edit', 'join_confirmation', 2147483647, 1, 9),
 ('bx_group_edit', 'allow_view_to', 2147483647, 1, 10),
 ('bx_group_edit', 'do_submit', 2147483647, 1, 11),
+
 ('bx_group_edit_cover', 'join_confirmation', 2147483647, 0, 0),
 ('bx_group_edit_cover', 'group_desc', 2147483647, 0, 0),
 ('bx_group_edit_cover', 'delete_confirm', 2147483647, 0, 1),
@@ -209,13 +213,18 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_group_edit_cover', 'group_cat', 2147483647, 0, 5),
 ('bx_group_edit_cover', 'cover', 2147483647, 1, 7),
 ('bx_group_edit_cover', 'do_submit', 2147483647, 1, 8),
+
 ('bx_group_view', 'delete_confirm', 2147483647, 0, 3),
 ('bx_group_view', 'picture', 2147483647, 0, 4),
 ('bx_group_view', 'cover', 2147483647, 0, 5),
 ('bx_group_view', 'do_submit', 2147483647, 0, 6),
 ('bx_group_view', 'group_name', 2147483647, 1, 7),
 ('bx_group_view', 'group_cat', 2147483647, 1, 8),
-('bx_group_view', 'group_desc', 2147483647, 0, 9);
+('bx_group_view', 'group_desc', 2147483647, 0, 9),
+
+('bx_group_view_full', 'group_name', 2147483647, 1, 1),
+('bx_group_view_full', 'group_cat', 2147483647, 1, 2),
+('bx_group_view_full', 'group_desc', 2147483647, 1, 3);
 
 -- PRE-VALUES
 

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

@@ -19,12 +19,9 @@ DELETE FROM `sys_transcoder_images_files` WHERE `transcoder_object` IN('bx_group
 -- FORMS
 
 DELETE FROM `sys_objects_form` WHERE `module` = 'bx_groups';
-
 DELETE FROM `sys_form_displays` WHERE `module` = 'bx_groups';
-
 DELETE FROM `sys_form_inputs` WHERE `module` = 'bx_groups';
-
-DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN('bx_group_add', 'bx_group_delete', 'bx_group_edit', 'bx_group_edit_cover', 'bx_group_view');
+DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN('bx_group_add', 'bx_group_delete', 'bx_group_edit', 'bx_group_edit_cover', 'bx_group_view', 'bx_group_view_full');
 
 -- PRE-VALUES
 

modules/boonex/market/classes/BxMarketModule.php

@@ -63,11 +63,6 @@ class BxMarketModule extends BxBaseModTextModule
         return $this->_oTemplate->entryAttachmentsByStorage($CNF['OBJECT_STORAGE_FILES'], $aContentInfo);
     }
 
-	public function serviceEntityInfoFull ($iContentId = 0)
-    {
-        return $this->_serviceEntityForm ('viewDataForm', $iContentId, $this->_oConfig->CNF['OBJECT_FORM_ENTRY_DISPLAY_VIEW_FULL']);
-    }
-
     public function serviceEntityRating($iContentId = 0)
     {
     	return $this->_serviceTemplateFunc ('entryRating', $iContentId);

modules/boonex/market/install/sql/enable.sql

@@ -83,7 +83,8 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 ('bx_market_view_entry_info', '_bx_market_page_title_sys_view_entry_info', '_bx_market_page_title_view_entry_info', 'bx_market', 5, 2147483647, 1, 'view-product-info', '', '', '', '', 0, 1, 0, 'BxMarketPageEntry', 'modules/boonex/market/classes/BxMarketPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
-('bx_market_view_entry_info', 1, 'bx_market', '_bx_market_page_block_title_entry_info', '_bx_market_page_block_title_entry_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:16:\"entity_info_full\";}', 0, 0, 1);
+('bx_market_view_entry_info', 1, 'bx_market', '_bx_market_page_block_title_entry_info', '_bx_market_page_block_title_entry_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:16:\"entity_info_full\";}', 0, 0, 1),
+('bx_market_view_entry_info', 1, 'bx_market', '', '_bx_market_page_block_title_entry_text', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 2);
 
 
 -- PAGE: categories
@@ -234,8 +235,8 @@ 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_market_view_submenu', 'bx_market', 'view-product', '_bx_market_menu_item_title_system_view_entry_submenu_entry', '_bx_market_menu_item_title_view_entry_submenu_entry', 'page.php?i=view-product&id={content_id}', '', '', '', '', 2147483647, 1, 0, 1),
-('bx_market_view_submenu', 'bx_market', 'view-product-comments', '_bx_market_menu_item_title_system_view_entry_submenu_comments', '_bx_market_menu_item_title_view_entry_submenu_comments', 'page.php?i=view-product-comments&id={content_id}', '', '', '', '', 2147483647, 1, 0, 2),
-('bx_market_view_submenu', 'bx_market', 'view-product-info', '_bx_market_menu_item_title_system_view_entry_submenu_info', '_bx_market_menu_item_title_view_entry_submenu_info', 'page.php?i=view-product-info&id={content_id}', '', '', '', '', 2147483647, 1, 0, 3);
+('bx_market_view_submenu', 'bx_market', 'view-product-info', '_bx_market_menu_item_title_system_view_entry_submenu_info', '_bx_market_menu_item_title_view_entry_submenu_info', 'page.php?i=view-product-info&id={content_id}', '', '', '', '', 2147483647, 1, 0, 2),
+('bx_market_view_submenu', 'bx_market', 'view-product-comments', '_bx_market_menu_item_title_system_view_entry_submenu_comments', '_bx_market_menu_item_title_view_entry_submenu_comments', 'page.php?i=view-product-comments&id={content_id}', '', '', '', '', 2147483647, 1, 0, 3);
 
 -- MENU: profile stats
 SET @iNotifMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_profile_stats' AND `active` = 1 LIMIT 1);

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -81,6 +81,7 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'OBJECT_METATAGS' => 'bx_organizations',
             'OBJECT_FORM_ENTRY' => 'bx_organization',
             'OBJECT_FORM_ENTRY_DISPLAY_VIEW' => 'bx_organization_view',
+        	'OBJECT_FORM_ENTRY_DISPLAY_VIEW_FULL' => 'bx_organization_view_full', // for "info" tab on view profile page
             'OBJECT_FORM_ENTRY_DISPLAY_ADD' => 'bx_organization_add',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_organization_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT_COVER' => 'bx_organization_edit_cover',

modules/boonex/organizations/classes/BxOrgsModule.php

@@ -27,6 +27,11 @@ class BxOrgsModule extends BxBaseModProfileModule
         unset($aFieldsProfile['description']);
         return $aFieldsProfile;
     }
+
+    public function serviceGetTimelineData()
+    {
+    	return array();
+    }
 }
 
 /** @} */

modules/boonex/organizations/install/config.php

@@ -96,10 +96,12 @@ $aConfig = array(
         'update_languages' => 1,
     	'process_connections' => 1,
     	'process_deleted_profiles' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
     'enable' => array(
         'execute_sql' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
     'enable_success' => array(
@@ -111,6 +113,7 @@ $aConfig = array(
     'disable' => array (
         'execute_sql' => 1,
     	'unregister_transcoders' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
     'disable_failed' => array (
@@ -127,7 +130,6 @@ $aConfig = array(
      * Connections Section
      */
     'relations' => array(
-        'bx_timeline',
         'bx_notifications',
     ),
 );

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

@@ -14,6 +14,7 @@
 	<string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
 	<string name="_bx_orgs_form_profile_display_delete"><![CDATA[Delete Organization]]></string>
 	<string name="_bx_orgs_form_profile_display_view"><![CDATA[View Organization]]></string>
+	<string name="_bx_orgs_form_profile_display_view_full"><![CDATA[Full View Organization]]></string>
     <string name="_bx_orgs_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_orgs_form_profile_input_sys_allow_view_to"><![CDATA[Visible to]]></string>
     <string name="_bx_orgs_form_profile_input_allow_view_to"><![CDATA[Visible to]]></string>

modules/boonex/organizations/install/sql/enable.sql

@@ -75,7 +75,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_organizations_profile_info', 'organization-profile-info', '_bx_orgs_page_title_sys_profile_info', '_bx_orgs_page_title_profile_info', 'bx_organizations', 5, 2147483647, 1, 'page.php?i=organization-profile-info', '', '', '', 0, 1, 0, 'BxOrgsPageEntry', 'modules/boonex/organizations/classes/BxOrgsPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_organizations_profile_info', 1, 'bx_organizations', '_bx_orgs_page_block_title_system_profile_info', '_bx_orgs_page_block_title_profile_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 1);
+('bx_organizations_profile_info', 1, 'bx_organizations', '_bx_orgs_page_block_title_system_profile_info', '_bx_orgs_page_block_title_profile_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:16:\"entity_info_full\";}', 0, 0, 1, 1),
+('bx_organizations_profile_info', 1, 'bx_organizations', '', '_bx_orgs_page_block_title_profile_description', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 2);
 
 -- PAGE: profile friends
 

modules/boonex/organizations/install/sql/install.sql

@@ -98,10 +98,11 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_organization', 'bx_organization_delete', 'bx_organizations', 0, '_bx_orgs_form_profile_display_delete'),
 ('bx_organization', 'bx_organization_edit', 'bx_organizations', 0, '_bx_orgs_form_profile_display_edit'),
 ('bx_organization', 'bx_organization_edit_cover', 'bx_organizations', 0, '_bx_orgs_form_profile_display_edit_cover'),
-('bx_organization', 'bx_organization_view', 'bx_organizations', 1, '_bx_orgs_form_profile_display_view');
+('bx_organization', 'bx_organization_view', 'bx_organizations', 1, '_bx_orgs_form_profile_display_view'),
+('bx_organization', 'bx_organization_view_full', 'bx_organizations', 1, '_bx_orgs_form_profile_display_view_full');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
-('bx_organization', 'bx_organization', 'allow_view_to', 3, '', 0, 'custom', '_bx_orgs_form_profile_input_sys_allow_view_to', '_bx_orgs_form_profile_input_allow_view_to', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
+('bx_organization', 'bx_organizations', 'allow_view_to', 3, '', 0, 'custom', '_bx_orgs_form_profile_input_sys_allow_view_to', '_bx_orgs_form_profile_input_allow_view_to', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('bx_organization', 'bx_organizations', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_orgs_form_profile_input_sys_delete_confirm', '_bx_orgs_form_profile_input_delete_confirm', '_bx_orgs_form_profile_input_delete_confirm_info', 1, 0, 0, '', '', '', 'avail', '', '_bx_orgs_form_profile_input_delete_confirm_error', '', '', 1, 0),
 ('bx_organization', 'bx_organizations', 'do_submit', '_sys_form_account_input_submit', '', 0, 'submit', '_bx_orgs_form_profile_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_organization', 'bx_organizations', 'org_desc', '', '', 0, 'textarea', '_bx_orgs_form_profile_input_sys_org_desc', '_bx_orgs_form_profile_input_org_desc', '', 0, 0, 0, '', '', '', '', '', '', 'XssMultiline', '', 1, 1),
@@ -120,12 +121,14 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_organization_add', 'org_desc', 2147483647, 1, 8),
 ('bx_organization_add', 'allow_view_to', 2147483647, 1, 9),
 ('bx_organization_add', 'do_submit', 2147483647, 1, 10),
+
 ('bx_organization_delete', 'picture', 2147483647, 0, 0),
 ('bx_organization_delete', 'delete_confirm', 2147483647, 1, 0),
 ('bx_organization_delete', 'cover', 2147483647, 0, 0),
 ('bx_organization_delete', 'do_submit', 2147483647, 1, 1),
 ('bx_organization_delete', 'org_name', 2147483647, 0, 2),
 ('bx_organization_delete', 'org_cat', 2147483647, 0, 3),
+
 ('bx_organization_edit', 'delete_confirm', 2147483647, 0, 2),
 ('bx_organization_edit', 'cover', 2147483647, 0, 3),
 ('bx_organization_edit', 'picture', 2147483647, 1, 5),
@@ -134,19 +137,25 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_organization_edit', 'org_desc', 2147483647, 1, 8),
 ('bx_organization_edit', 'allow_view_to', 2147483647, 1, 9),
 ('bx_organization_edit', 'do_submit', 2147483647, 1, 10),
+
 ('bx_organization_edit_cover', 'delete_confirm', 2147483647, 0, 1),
 ('bx_organization_edit_cover', 'org_name', 2147483647, 0, 2),
 ('bx_organization_edit_cover', 'picture', 2147483647, 0, 3),
 ('bx_organization_edit_cover', 'org_cat', 2147483647, 0, 5),
 ('bx_organization_edit_cover', 'cover', 2147483647, 1, 7),
 ('bx_organization_edit_cover', 'do_submit', 2147483647, 1, 8),
+
 ('bx_organization_view', 'delete_confirm', 2147483647, 0, 3),
 ('bx_organization_view', 'picture', 2147483647, 0, 4),
 ('bx_organization_view', 'cover', 2147483647, 0, 5),
 ('bx_organization_view', 'do_submit', 2147483647, 0, 6),
 ('bx_organization_view', 'org_name', 2147483647, 1, 7),
 ('bx_organization_view', 'org_cat', 2147483647, 1, 8),
-('bx_organization_view', 'org_desc', 2147483647, 0, 9);
+('bx_organization_view', 'org_desc', 2147483647, 0, 9),
+
+('bx_organization_view_full', 'org_name', 2147483647, 1, 1),
+('bx_organization_view_full', 'org_cat', 2147483647, 1, 2),
+('bx_organization_view_full', 'org_desc', 2147483647, 1, 3);
 
 -- PRE-VALUES
 

modules/boonex/organizations/install/sql/uninstall.sql

@@ -19,12 +19,9 @@ DELETE FROM `sys_transcoder_images_files` WHERE `transcoder_object` IN('bx_organ
 -- FORMS
 
 DELETE FROM `sys_objects_form` WHERE `module` = 'bx_organizations';
-
 DELETE FROM `sys_form_displays` WHERE `module` = 'bx_organizations';
-
 DELETE FROM `sys_form_inputs` WHERE `module` = 'bx_organizations';
-
-DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN('bx_organization_add', 'bx_organization_delete', 'bx_organization_edit', 'bx_organization_edit_cover', 'bx_organization_view');
+DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN('bx_organization_add', 'bx_organization_delete', 'bx_organization_edit', 'bx_organization_edit_cover', 'bx_organization_view', 'bx_organization_view_full');
 
 -- PRE-VALUES
 

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -81,6 +81,7 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'OBJECT_METATAGS' => 'bx_persons',
             'OBJECT_FORM_ENTRY' => 'bx_person',
             'OBJECT_FORM_ENTRY_DISPLAY_VIEW' => 'bx_person_view',
+        	'OBJECT_FORM_ENTRY_DISPLAY_VIEW_FULL' => 'bx_person_view_full', // for "info" tab on view profile page 
             'OBJECT_FORM_ENTRY_DISPLAY_ADD' => 'bx_person_add',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_person_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT_COVER' => 'bx_person_edit_cover',

modules/boonex/persons/classes/BxPersonsModule.php

@@ -18,6 +18,11 @@ class BxPersonsModule extends BxBaseModProfileModule
     {
         parent::__construct($aModule);
     }
+
+    public function serviceGetTimelineData()
+    {
+    	return array();
+    }
 }
 
 /** @} */

modules/boonex/persons/install/config.php

@@ -96,10 +96,12 @@ $aConfig = array(
         'update_languages' => 1,
     	'process_connections' => 1,
     	'process_deleted_profiles' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
     'enable' => array(
         'execute_sql' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
 	'enable_success' => array(
@@ -111,6 +113,7 @@ $aConfig = array(
     'disable' => array (
         'execute_sql' => 1,
     	'unregister_transcoders' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
     'disable_failed' => array (
@@ -127,7 +130,6 @@ $aConfig = array(
      * Connections Section
      */
     'relations' => array(
-        'bx_timeline',
         'bx_notifications',
     ),
 );

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

@@ -14,6 +14,7 @@
 	<string name="_bx_persons_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
 	<string name="_bx_persons_form_profile_display_delete"><![CDATA[Delete Person]]></string>
 	<string name="_bx_persons_form_profile_display_view"><![CDATA[View Person]]></string>
+	<string name="_bx_persons_form_profile_display_view_full"><![CDATA[Full View Person]]></string>
     <string name="_bx_persons_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_persons_form_profile_input_submit"><![CDATA[Submit]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Visible to]]></string>

modules/boonex/persons/install/sql/enable.sql

@@ -75,7 +75,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_persons_profile_info', 'persons-profile-info', '_bx_persons_page_title_sys_profile_info', '_bx_persons_page_title_profile_info', 'bx_persons', 5, 2147483647, 1, 'page.php?i=persons-profile-info', '', '', '', 0, 1, 0, 'BxPersonsPageEntry', 'modules/boonex/persons/classes/BxPersonsPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_persons_profile_info', 1, 'bx_persons', '_bx_persons_page_block_title_system_profile_info', '_bx_persons_page_block_title_profile_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 1);
+('bx_persons_profile_info', 1, 'bx_persons', '_bx_persons_page_block_title_system_profile_info', '_bx_persons_page_block_title_profile_info_link', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:16:\"entity_info_full\";}', 0, 0, 1, 1),
+('bx_persons_profile_info', 1, 'bx_persons', '', '_bx_persons_page_block_title_profile_description', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 2);
 
 -- PAGE: profile friends
 

modules/boonex/persons/install/sql/install.sql

@@ -98,7 +98,8 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_person', 'bx_person_delete', 'bx_persons', 0, '_bx_persons_form_profile_display_delete'),
 ('bx_person', 'bx_person_edit', 'bx_persons', 0, '_bx_persons_form_profile_display_edit'),
 ('bx_person', 'bx_person_edit_cover', 'bx_persons', 0, '_bx_persons_form_profile_display_edit_cover'),
-('bx_person', 'bx_person_view', 'bx_persons', 1, '_bx_persons_form_profile_display_view');
+('bx_person', 'bx_person_view', 'bx_persons', 1, '_bx_persons_form_profile_display_view'),
+('bx_person', 'bx_person_view_full', 'bx_persons', 1, '_bx_persons_form_profile_display_view_full');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
 ('bx_person', 'bx_persons', 'allow_view_to', 3, '', 0, 'custom', '_bx_persons_form_profile_input_sys_allow_view_to', '_bx_persons_form_profile_input_allow_view_to', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
@@ -118,11 +119,13 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_person_add', 'description', 2147483647, 1, 8),
 ('bx_person_add', 'allow_view_to', 2147483647, 1, 9),
 ('bx_person_add', 'do_submit', 2147483647, 1, 10),
+
 ('bx_person_delete', 'cover', 2147483647, 0, 0),
 ('bx_person_delete', 'picture', 2147483647, 0, 0),
 ('bx_person_delete', 'delete_confirm', 2147483647, 1, 0),
 ('bx_person_delete', 'do_submit', 2147483647, 1, 1),
 ('bx_person_delete', 'fullname', 2147483647, 0, 2),
+
 ('bx_person_edit', 'delete_confirm', 2147483647, 0, 2),
 ('bx_person_edit', 'cover', 2147483647, 0, 3),
 ('bx_person_edit', 'picture', 2147483647, 1, 5),
@@ -130,17 +133,22 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_person_edit', 'description', 2147483647, 1, 7),
 ('bx_person_edit', 'allow_view_to', 2147483647, 1, 8),
 ('bx_person_edit', 'do_submit', 2147483647, 1, 9),
+
 ('bx_person_edit_cover', 'delete_confirm', 2147483647, 0, 1),
 ('bx_person_edit_cover', 'fullname', 2147483647, 0, 2),
 ('bx_person_edit_cover', 'picture', 2147483647, 0, 3),
 ('bx_person_edit_cover', 'cover', 2147483647, 1, 7),
 ('bx_person_edit_cover', 'do_submit', 2147483647, 1, 8),
+
 ('bx_person_view', 'delete_confirm', 2147483647, 0, 3),
 ('bx_person_view', 'picture', 2147483647, 0, 4),
 ('bx_person_view', 'cover', 2147483647, 0, 5),
 ('bx_person_view', 'do_submit', 2147483647, 0, 6),
 ('bx_person_view', 'fullname', 2147483647, 1, 7),
-('bx_person_view', 'description', 2147483647, 0, 8);
+('bx_person_view', 'description', 2147483647, 0, 8),
+
+('bx_person_view_full', 'fullname', 2147483647, 1, 1),
+('bx_person_view_full', 'description', 2147483647, 1, 2);
 
 -- STUDIO PAGE & WIDGET
 

modules/boonex/persons/install/sql/uninstall.sql

@@ -19,12 +19,9 @@ DELETE FROM `sys_transcoder_images_files` WHERE `transcoder_object` IN('bx_perso
 -- FORMS
 
 DELETE FROM `sys_objects_form` WHERE `module` = 'bx_persons';
-
 DELETE FROM `sys_form_displays` WHERE `module` = 'bx_persons';
-
 DELETE FROM `sys_form_inputs` WHERE `module` = 'bx_persons';
-
-DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN('bx_person_add', 'bx_person_delete', 'bx_person_edit', 'bx_person_edit_cover', 'bx_person_view');
+DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN('bx_person_add', 'bx_person_delete', 'bx_person_edit', 'bx_person_edit_cover', 'bx_person_view', 'bx_person_view_full');
 
 -- STUDIO PAGE & WIDGET
 

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

@@ -7,11 +7,12 @@
 	<string name="_bx_groups_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
 
 	<string name="_bx_groups_form_profile"><![CDATA[Группы]]></string>
-	<string name="_bx_groups_form_profile_display_add"><![CDATA[Добавить группу]]></string>
-	<string name="_bx_groups_form_profile_display_edit"><![CDATA[Редактировать группу]]></string>
-	<string name="_bx_groups_form_profile_display_edit_cover"><![CDATA[Редактировать обложку]]></string>
-	<string name="_bx_groups_form_profile_display_delete"><![CDATA[Удалить группу]]></string>
-	<string name="_bx_groups_form_profile_display_view"><![CDATA[Просмотреть группу]]></string>
+	<string name="_bx_groups_form_profile_display_add"><![CDATA[Добавление группы]]></string>
+	<string name="_bx_groups_form_profile_display_edit"><![CDATA[Редактирование группы]]></string>
+	<string name="_bx_groups_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
+	<string name="_bx_groups_form_profile_display_delete"><![CDATA[Удаление группы]]></string>
+	<string name="_bx_groups_form_profile_display_view"><![CDATA[Полный группы]]></string>
+	<string name="_bx_groups_form_profile_display_view_full"><![CDATA[Полный просмотр группы]]></string>
 	<string name="_bx_groups_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_groups_form_profile_input_sys_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_groups_form_profile_input_join_confirm"><![CDATA[Подтверждение регистрации]]></string>

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

@@ -9,11 +9,12 @@
 	<string name="_bx_orgs_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
 
 	<string name="_bx_orgs_form_profile"><![CDATA[Организации]]></string>
-	<string name="_bx_orgs_form_profile_display_add"><![CDATA[Добавить организацию]]></string>
-	<string name="_bx_orgs_form_profile_display_edit"><![CDATA[Редактировать организацию]]></string>
-	<string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Редактировать обложку]]></string>
-	<string name="_bx_orgs_form_profile_display_delete"><![CDATA[Удалить организацию]]></string>
-	<string name="_bx_orgs_form_profile_display_view"><![CDATA[Просмотреть организацию]]></string>
+	<string name="_bx_orgs_form_profile_display_add"><![CDATA[Добавление организации]]></string>
+	<string name="_bx_orgs_form_profile_display_edit"><![CDATA[Редактирование организации]]></string>
+	<string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
+	<string name="_bx_orgs_form_profile_display_delete"><![CDATA[Удаление организации]]></string>
+	<string name="_bx_orgs_form_profile_display_view"><![CDATA[Просмотр организации]]></string>
+	<string name="_bx_orgs_form_profile_display_view_full"><![CDATA[Полный просмотр организации]]></string>
     <string name="_bx_orgs_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_orgs_form_profile_input_sys_allow_view_to"><![CDATA[Доступен для]]></string>
     <string name="_bx_orgs_form_profile_input_allow_view_to"><![CDATA[Доступен для]]></string>

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

@@ -14,6 +14,7 @@
 	<string name="_bx_persons_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
 	<string name="_bx_persons_form_profile_display_delete"><![CDATA[Удаление персоны]]></string>
 	<string name="_bx_persons_form_profile_display_view"><![CDATA[Просмотр персоны]]></string>
+	<string name="_bx_persons_form_profile_display_view_full"><![CDATA[Полный просмотр персоны]]></string>
     <string name="_bx_persons_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_persons_form_profile_input_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Доступен для]]></string>

modules/boonex/timeline/classes/BxTimelineDb.php

@@ -241,7 +241,7 @@ class BxTimelineDb extends BxBaseModNotificationsDb
             $sWhereAddon = " AND `id`=:id";
         }
 
-        return $this->query("DELETE FROM `" . $this->_sPrefix . "links` WHERE `profile_id`=:profile_id" . $sWhereAddon);
+        return $this->query("DELETE FROM `" . $this->_sPrefix . "links` WHERE `profile_id`=:profile_id" . $sWhereAddon, $aBindings);
     }
 
     public function saveLink($iEventId, $iLinkId)

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -402,7 +402,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule
             ),
             'alerts' => array(
                 array('unit' => $sModule, 'action' => 'post_common'),
-                array('unit' => $sModule, 'action' => 'deleted'),
+                array('unit' => $sModule, 'action' => 'delete'),
                 array('unit' => $sModule, 'action' => 'commentPost'),
                 array('unit' => $sModule, 'action' => 'commentRemoved'),
                 array('unit' => $sModule, 'action' => 'doVote'),

modules/boonex/timeline/template/css/share.css

@@ -23,8 +23,8 @@ div.bx-tl-by-list div.bx-base-pofile-unit {
 }
 .bx-tl-share-button .bx-tl-share-element-holder,
 .bx-tl-share-button .bx-tl-share-counter-holder {
-	line-height: 36px;
-	line-height: 2.2rem;
+	line-height: 40px;
+	line-height: 2.5rem;
 }
 .bx-tl-share.bx-tl-share-button .bx-tl-share-counter-holder {
 	margin-left: 10px;

template/css/account.css

@@ -9,6 +9,11 @@
     margin-top:1px;
 }
 
+.bx-db-content .sys-profile-switch-row.bx-def-margin-leftright-neg {
+	margin-left: 0px;
+    margin-right: 0px;	
+}
+
 .sys-profile-switch-row-control,
 .sys-profile-switch-row-unit {
     display:inline-block;

template/css/forms.css

@@ -485,7 +485,7 @@
     cursor:pointer;
     display:block;
     float:left;
-    padding:0.3em 1.5em 0.3em 0.5em;
+    padding:0.55em 1.5em 0.55em 0.5em;
     margin:0.1em;
     font-weight:normal;
 }