Procházet zdrojové kódy

Ticket #438 - Integration in Events.

AntonLV před 10 roky
rodič
revize
5fd2c74efd

+ 2 - 0
modules/boonex/events/classes/BxEventsConfig.php

@@ -77,6 +77,7 @@ class BxEventsConfig extends BxBaseModProfileConfig
             'OBJECT_IMAGES_TRANSCODER_COVER_THUMB' => 'bx_events_cover_thumb',
             'OBJECT_VIEWS' => 'bx_events',
             'OBJECT_VOTES' => 'bx_events',
+        	'OBJECT_FAVORITES' => 'bx_events',
             'OBJECT_REPORTS' => 'bx_events',
             'OBJECT_METATAGS' => 'bx_events',
             'OBJECT_FORM_ENTRY' => 'bx_event',
@@ -162,6 +163,7 @@ class BxEventsConfig extends BxBaseModProfileConfig
                 
                 'menu_item_title_become_fan_sent' => '_bx_events_menu_item_title_become_fan_sent',
                 'menu_item_title_become_fan' => '_bx_events_menu_item_title_become_fan',
+            	'txt_all_entries_by_author' => '_bx_events_page_title_browse_by_author'
             ),
 
         );

+ 5 - 1
modules/boonex/events/classes/BxEventsSearchResult.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxEventsSearchResult extends BxBaseModProfileSearchResult
+class BxEventsSearchResult extends BxBaseModGroupsSearchResult
 {
     function __construct($sMode = '', $aParams = false)
     {
@@ -114,6 +114,10 @@ class BxEventsSearchResult extends BxBaseModProfileSearchResult
                 }
                 break;
 
+            case 'favorite':
+                $this->_setFavoriteConditions($sMode, $aParams, $oJoinedProfile);
+                break;
+
             case 'recent':
                 $this->aCurrent['rss']['link'] = 'modules/?r=events/rss/' . $sMode;
                 $this->aCurrent['title'] = _t('_bx_events_page_title_browse_recent');

+ 3 - 0
modules/boonex/events/install/langs/en.xml

@@ -79,6 +79,7 @@
 	<string name="_bx_events_page_title_sys_view_profile"><![CDATA[View Event]]></string>
 	<string name="_bx_events_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_events_page_title_browse"><![CDATA[Events]]></string>
+	<string name="_bx_events_page_title_browse_by_author"><![CDATA[Events of {display_name}]]></string>
 	<string name="_bx_events_page_title_browse_top"><![CDATA[Top Events]]></string>
 	<string name="_bx_events_page_title_browse_recent"><![CDATA[New Events]]></string>
 	<string name="_bx_events_page_title_browse_connections"><![CDATA[{0} connections]]></string>
@@ -99,6 +100,8 @@
 	<string name="_bx_events_page_title_sys_calendar"><![CDATA[Events Calendar]]></string>
 	<string name="_bx_events_page_title_calendar"><![CDATA[Events Calendar]]></string>
 
+	<string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Favorite Events]]></string>
+    <string name="_bx_events_page_block_title_sys_favorites_of_author"><![CDATA[Favorite Events]]></string>
 	<string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Joined Events]]></string>
 	<string name="_bx_events_page_block_title_joined_entries"><![CDATA[Joined Events]]></string>
 	<string name="_bx_events_page_block_title_create_profile"><![CDATA[Create Event]]></string>

+ 3 - 0
modules/boonex/events/install/sql/disable.sql

@@ -31,6 +31,9 @@ DELETE FROM `sys_objects_vote` WHERE `Name` = 'bx_events';
 -- REPORTS
 DELETE FROM `sys_objects_report` WHERE `name` = 'bx_events';
 
+-- FAFORITES
+DELETE FROM `sys_objects_favorite` WHERE `Name` = 'bx_events';
+
 -- METATAGS
 DELETE FROM `sys_objects_metatags` WHERE `object` = 'bx_events';
 

+ 7 - 2
modules/boonex/events/install/sql/enable.sql

@@ -132,8 +132,9 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_events_joined', 'joined-events', '_bx_events_page_title_sys_joined_entries', '_bx_events_page_title_joined_entries', 'bx_events', 5, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxEventsPageJoinedEntries', 'modules/boonex/events/classes/BxEventsPageJoinedEntries.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_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_joined_entries', '_bx_events_page_block_title_joined_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"browse_joined_entries";s:6:"params";a:2:{i:0;i:0;i:1;b:1;}}', 0, 0, 1, 1);
+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_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_favorites_of_author', '_bx_events_page_block_title_favorites_of_author', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:15:"browse_favorite";s:6:"params";a:1:{i:0;s:12:"{profile_id}";}}', 0, 1, 1, 1),
+('bx_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_joined_entries', '_bx_events_page_block_title_joined_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"browse_joined_entries";s:6:"params";a:2:{i:0;i:0;i:1;b:1;}}', 0, 0, 1, 2);
 
 -- PAGE: add block to homepage
 SET @iBlockOrder = (SELECT `order` FROM `sys_pages_blocks` WHERE `object` = 'sys_home' AND `cell_id` = 1 ORDER BY `order` DESC LIMIT 1);
@@ -322,6 +323,10 @@ INSERT INTO `sys_objects_vote` (`Name`, `TableMain`, `TableTrack`, `PostTimeout`
 INSERT INTO `sys_objects_report` (`name`, `table_main`, `table_track`, `is_on`, `base_url`, `trigger_table`, `trigger_field_id`, `trigger_field_author`, `trigger_field_count`, `class_name`, `class_file`) VALUES 
 ('bx_events', 'bx_events_reports', 'bx_events_reports_track', '1', 'page.php?i=view-event-profile&id={object_id}', 'bx_events_data', 'id', 'author', 'reports', '', '');
 
+-- FAFORITES
+INSERT INTO `sys_objects_favorite` (`name`, `table_track`, `is_on`, `is_undo`, `is_public`, `base_url`, `trigger_table`, `trigger_field_id`, `trigger_field_author`, `trigger_field_count`, `class_name`, `class_file`) VALUES 
+('bx_events', 'bx_events_favorites_track', '1', '1', '1', 'page.php?i=view-event-profile&id={object_id}', 'bx_events_data', 'id', 'author', 'favorites', '', '');
+
 -- METATAGS
 INSERT INTO `sys_objects_metatags` (`object`, `table_keywords`, `table_locations`, `table_mentions`, `override_class_name`, `override_class_file`) VALUES
 ('bx_events', 'bx_events_meta_keywords', 'bx_events_meta_locations', '', '', '');

+ 10 - 1
modules/boonex/events/install/sql/install.sql

@@ -16,6 +16,7 @@ CREATE TABLE IF NOT EXISTS `bx_events_data` (
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',
+  `favorites` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `join_confirmation` tinyint(4) NOT NULL DEFAULT '1',
   `allow_view_to` varchar(255) DEFAULT NULL,
@@ -160,8 +161,16 @@ CREATE TABLE IF NOT EXISTS `bx_events_admins` (
   UNIQUE KEY `admin` (`group_profile_id`,`fan_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
--- STORAGES & TRANSCODERS
+-- TABLE: favorites
+CREATE TABLE `bx_events_favorites_track` (
+  `object_id` int(11) NOT NULL default '0',
+  `author_id` int(11) NOT NULL default '0',
+  `date` int(11) NOT NULL default '0',
+  KEY `id` (`object_id`,`author_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 
+-- STORAGES & TRANSCODERS
 INSERT INTO `sys_objects_storage` (`object`, `engine`, `params`, `token_life`, `cache_control`, `levels`, `table_files`, `ext_mode`, `ext_allow`, `ext_deny`, `quota_size`, `current_size`, `quota_number`, `current_number`, `max_file_size`, `ts`) VALUES
 ('bx_events_pics', 'Local', '', 360, 2592000, 3, 'bx_events_pics', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0),
 ('bx_events_pics_resized', 'Local', '', 360, 2592000, 3, 'bx_events_pics_resized', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0);

+ 1 - 1
modules/boonex/events/install/sql/uninstall.sql

@@ -1,7 +1,7 @@
 
 -- TABLES
 
-DROP TABLE IF EXISTS `bx_events_data`, `bx_events_intervals`, `bx_events_pics`, `bx_events_pics_resized`, `bx_events_views_track`, `bx_events_meta_keywords`, `bx_events_meta_locations`, `bx_events_fans`, `bx_events_admins`, `bx_events_votes`, `bx_events_votes_track`, `bx_events_reports`, `bx_events_reports_track`;
+DROP TABLE IF EXISTS `bx_events_data`, `bx_events_intervals`, `bx_events_pics`, `bx_events_pics_resized`, `bx_events_views_track`, `bx_events_meta_keywords`, `bx_events_meta_locations`, `bx_events_fans`, `bx_events_admins`, `bx_events_votes`, `bx_events_votes_track`, `bx_events_reports`, `bx_events_reports_track`, `bx_events_favorites_track`;
 
 -- PROFILES
 

+ 3 - 0
modules/boonex/russian/data/langs/bx_events/ru.xml

@@ -77,6 +77,7 @@
 	<string name="_bx_events_page_title_sys_view_profile"><![CDATA[Просмотр события]]></string>
 	<string name="_bx_events_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_events_page_title_browse"><![CDATA[События]]></string>
+	<string name="_bx_events_page_title_browse_by_author"><![CDATA[События {display_name}]]></string>
 	<string name="_bx_events_page_title_browse_top"><![CDATA[Лучшие события]]></string>
 	<string name="_bx_events_page_title_browse_recent"><![CDATA[Новые события]]></string>
 	<string name="_bx_events_page_title_browse_connections"><![CDATA[{0} связей]]></string>
@@ -97,6 +98,8 @@
 	<string name="_bx_events_page_title_sys_calendar"><![CDATA[Календарь событий]]></string>
 	<string name="_bx_events_page_title_calendar"><![CDATA[Календарь событий]]></string>
 
+	<string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Избранные события]]></string>   
+    <string name="_bx_events_page_block_title_sys_favorites_of_author"><![CDATA[Избранные события]]></string>
 	<string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Участие в событиях]]></string>
 	<string name="_bx_events_page_block_title_joined_entries"><![CDATA[Участие в событиях]]></string>
 	<string name="_bx_events_page_block_title_create_profile"><![CDATA[Создать событие]]></string>