Selaa lähdekoodia

Merge branch 'master' of https://github.com/unacms/una

AntonLV 1 vuosi sitten
vanhempi
sitoutus
f0718ba412
63 muutettua tiedostoa jossa 138 lisäystä ja 111 poistoa
  1. 2 0
      inc/classes/BxDolFormQuery.php
  2. 2 2
      modules/boonex/accounts/install/config.php
  3. 2 2
      modules/boonex/acl/install/config.php
  4. 2 2
      modules/boonex/ads/install/config.php
  5. 9 0
      modules/boonex/ads/updates/14.0.6_15.0.0/install/sql/install.sql
  6. 4 4
      modules/boonex/ads/updates/14.0.6_15.0.0/source/install/sql/install.sql
  7. 2 2
      modules/boonex/albums/install/config.php
  8. 2 2
      modules/boonex/analytics/install/config.php
  9. 2 2
      modules/boonex/artificer/install/config.php
  10. 2 2
      modules/boonex/channels/install/config.php
  11. 2 2
      modules/boonex/charts/install/config.php
  12. 2 2
      modules/boonex/classes/install/config.php
  13. 2 2
      modules/boonex/contact/install/config.php
  14. 2 2
      modules/boonex/courses/install/config.php
  15. 1 0
      modules/boonex/courses/updates/14.0.4_15.0.0/install/installer.php
  16. 2 2
      modules/boonex/developer/install/config.php
  17. 2 2
      modules/boonex/donations/install/config.php
  18. 2 2
      modules/boonex/elasticsearch/install/config.php
  19. 2 2
      modules/boonex/english/install/config.php
  20. 2 2
      modules/boonex/events/install/config.php
  21. 1 1
      modules/boonex/events/updates/14.0.8_15.0.0/install/installer.php
  22. 1 1
      modules/boonex/events/updates/14.0.8_15.0.0/install/sql/enable.sql
  23. 2 2
      modules/boonex/files/install/config.php
  24. 2 2
      modules/boonex/fontawesome/install/config.php
  25. 2 2
      modules/boonex/forum/install/config.php
  26. 2 2
      modules/boonex/glossary/install/config.php
  27. 2 2
      modules/boonex/google_connect/install/config.php
  28. 2 2
      modules/boonex/google_tagmanager/install/config.php
  29. 2 2
      modules/boonex/groups/install/config.php
  30. 2 2
      modules/boonex/invites/install/config.php
  31. 4 2
      modules/boonex/invites/updates/14.0.5_15.0.0/install/installer.php
  32. 2 2
      modules/boonex/lucid/install/config.php
  33. 2 2
      modules/boonex/market/install/config.php
  34. 2 2
      modules/boonex/notifications/install/config.php
  35. 2 2
      modules/boonex/oauth2/install/config.php
  36. 2 2
      modules/boonex/organizations/install/config.php
  37. 2 2
      modules/boonex/payment/install/config.php
  38. 2 2
      modules/boonex/persons/install/config.php
  39. 2 0
      modules/boonex/persons/updates/14.0.6_15.0.0/install/sql/install.sql
  40. 2 2
      modules/boonex/photos/install/config.php
  41. 2 2
      modules/boonex/plyr/install/config.php
  42. 2 2
      modules/boonex/polls/install/config.php
  43. 1 1
      modules/boonex/polls/updates/14.0.2_15.0.0/install/sql/enable.sql
  44. 2 2
      modules/boonex/posts/install/config.php
  45. 2 2
      modules/boonex/profiler/install/config.php
  46. 2 2
      modules/boonex/protean/install/config.php
  47. 2 2
      modules/boonex/quoteofday/install/config.php
  48. 2 2
      modules/boonex/russian/install/config.php
  49. 2 2
      modules/boonex/shopify/install/config.php
  50. 1 1
      modules/boonex/shopify/updates/13.0.4_15.0.0/install/config.php
  51. 2 2
      modules/boonex/smtpmailer/install/config.php
  52. 2 2
      modules/boonex/snipcart/install/config.php
  53. 2 2
      modules/boonex/spaces/install/config.php
  54. 2 2
      modules/boonex/stream/install/config.php
  55. 2 2
      modules/boonex/stripe_connect/install/config.php
  56. 2 2
      modules/boonex/tasks/install/config.php
  57. 2 2
      modules/boonex/timeline/install/config.php
  58. 2 2
      modules/boonex/videos/install/config.php
  59. 2 2
      modules/boonex/xero/install/config.php
  60. 2 0
      upgrade/files/14.0.0-15.0.0.A1/files/inc/classes/BxDolFormQuery.php
  61. 9 0
      upgrade/files/14.0.0-15.0.0.A1/files/inc/classes/BxDolSearch.php
  62. 2 2
      upgrade/files/14.0.0-15.0.0.A1/files/plugins/composer/installed.php
  63. 1 1
      upgrade/files/14.0.0-15.0.0.A1/files/plugins_public/highlight/highlight.min.js

+ 2 - 0
inc/classes/BxDolFormQuery.php

@@ -211,6 +211,8 @@ class BxDolFormQuery extends BxDolDb
 
     static public function getDataItems($sKey, $isUseForSet = false, $sUseValues = BX_DATA_VALUES_DEFAULT)
     {
+        bx_import('BxDolLanguages');
+        
         $oDb = BxDolDb::getInstance();
 
         if(!in_array($sUseValues, array(BX_DATA_VALUES_DEFAULT, BX_DATA_VALUES_ADDITIONAL, BX_DATA_VALUES_ALL)))

+ 2 - 2
modules/boonex/accounts/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_accounts',
     'title' => 'Accounts Manager',
     'note' => 'Accounts Manager module.',
-    'version' => '14.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/acl/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_acl',
     'title' => 'Paid Levels',
     'note' => 'Paid Levels module.',
-    'version' => '13.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/ads/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_ads',
     'title' => 'Ads',
     'note' => 'Ads module.',
-    'version' => '14.0.7.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 9 - 0
modules/boonex/ads/updates/14.0.6_15.0.0/install/sql/install.sql

@@ -17,3 +17,12 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_year_edit', 'controls', 2147483647, 1, @iOrder+1),
 ('bx_ads_entry_price_year_edit', 'do_submit', 2147483647, 1, @iOrder+2),
 ('bx_ads_entry_price_year_edit', 'do_cancel', 2147483647, 1, @iOrder+3);
+
+DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN ('bx_ads_entry_price_add', 'bx_ads_entry_price_edit', 'bx_ads_entry_price_year_add', 'bx_ads_entry_price_year_edit') AND `input_name`='seg_sex';
+DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN ('bx_ads_entry_price_add', 'bx_ads_entry_price_edit', 'bx_ads_entry_price_year_add', 'bx_ads_entry_price_year_edit') AND `input_name`='seg_gender';
+INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 
+('bx_ads_entry_price_add', 'seg_gender', 2147483647, 1, 26),
+('bx_ads_entry_price_edit', 'seg_gender', 2147483647, 1, 23),
+
+('bx_ads_entry_price_year_add', 'seg_gender', 2147483647, 1, 27),
+('bx_ads_entry_price_year_edit', 'seg_gender', 2147483647, 1, 24);

+ 4 - 4
modules/boonex/ads/updates/14.0.6_15.0.0/source/install/sql/install.sql

@@ -893,7 +893,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_add', 'location', 2147483647, 1, 23),
 ('bx_ads_entry_price_add', 'seg_header_beg', 2147483647, 1, 24),
 ('bx_ads_entry_price_add', 'seg', 2147483647, 1, 25),
-('bx_ads_entry_price_add', 'seg_sex', 2147483647, 1, 26),
+('bx_ads_entry_price_add', 'seg_gender', 2147483647, 1, 26),
 ('bx_ads_entry_price_add', 'seg_age', 2147483647, 1, 27),
 ('bx_ads_entry_price_add', 'seg_country', 2147483647, 1, 28),
 ('bx_ads_entry_price_add', 'seg_header_end', 2147483647, 1, 29),
@@ -921,7 +921,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_edit', 'location', 2147483647, 1, 20),
 ('bx_ads_entry_price_edit', 'seg_header_beg', 2147483647, 1, 21),
 ('bx_ads_entry_price_edit', 'seg', 2147483647, 1, 22),
-('bx_ads_entry_price_edit', 'seg_sex', 2147483647, 1, 23),
+('bx_ads_entry_price_edit', 'seg_gender', 2147483647, 1, 23),
 ('bx_ads_entry_price_edit', 'seg_age', 2147483647, 1, 24),
 ('bx_ads_entry_price_edit', 'seg_country', 2147483647, 1, 25),
 ('bx_ads_entry_price_edit', 'seg_header_end', 2147483647, 1, 26),
@@ -961,7 +961,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_year_add', 'location', 2147483647, 1, 24),
 ('bx_ads_entry_price_year_add', 'seg_header_beg', 2147483647, 1, 25),
 ('bx_ads_entry_price_year_add', 'seg', 2147483647, 1, 26),
-('bx_ads_entry_price_year_add', 'seg_sex', 2147483647, 1, 27),
+('bx_ads_entry_price_year_add', 'seg_gender', 2147483647, 1, 27),
 ('bx_ads_entry_price_year_add', 'seg_age', 2147483647, 1, 28),
 ('bx_ads_entry_price_year_add', 'seg_country', 2147483647, 1, 29),
 ('bx_ads_entry_price_year_add', 'seg_header_end', 2147483647, 1, 30),
@@ -990,7 +990,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_year_edit', 'location', 2147483647, 1, 21),
 ('bx_ads_entry_price_year_edit', 'seg_header_beg', 2147483647, 1, 22),
 ('bx_ads_entry_price_year_edit', 'seg', 2147483647, 1, 23),
-('bx_ads_entry_price_year_edit', 'seg_sex', 2147483647, 1, 24),
+('bx_ads_entry_price_year_edit', 'seg_gender', 2147483647, 1, 24),
 ('bx_ads_entry_price_year_edit', 'seg_age', 2147483647, 1, 25),
 ('bx_ads_entry_price_year_edit', 'seg_country', 2147483647, 1, 26),
 ('bx_ads_entry_price_year_edit', 'seg_header_end', 2147483647, 1, 27),

+ 2 - 2
modules/boonex/albums/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_albums',
     'title' => 'Albums',
     'note' => 'Photos & videos',
-    'version' => '14.0.7.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/analytics/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_analytics',
     'title' => 'Analytics',
     'note' => 'Analytics module.',
-    'version' => '14.0.3.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/artificer/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_artificer',
     'title' => 'Artificer',
     'note' => 'Design template',
-    'version' => '14.0.10.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/channels/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_channels',
     'title' => 'Channels',
     'note' => 'Channels functionality.',
-    'version' => '14.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/charts/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_charts',
     'title' => 'Charts',
     'note' => 'Charts module.',
-    'version' => '13.0.3.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/classes/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_classes',
     'title' => 'Classes',
     'note' => 'Classes module.',
-    'version' => '14.0.3.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/contact/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_contact',
     'title' => 'Contact',
     'note' => 'Contact module.',
-    'version' => '14.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/courses/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_courses',
     'title' => 'Courses',
     'note' => 'Basic course profiles functionality.',
-    'version' => '14.0.5.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 1 - 0
modules/boonex/courses/updates/14.0.4_15.0.0/install/installer.php

@@ -29,6 +29,7 @@ class BxCoursesUpdater extends BxDolStudioUpdater
                 $this->oDb->query("ALTER TABLE `bx_courses_prices` ADD `default` tinyint(4) NOT NULL default '0' AFTER `order`");
             if(!$this->oDb->isFieldExists('bx_courses_prices', 'active'))
                 $this->oDb->query("ALTER TABLE `bx_courses_prices` ADD `active` tinyint(4) NOT NULL default '1' AFTER `default`");
+        }
 
         return parent::actionExecuteSql($sOperation);
     }

+ 2 - 2
modules/boonex/developer/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_developer',
     'title' => 'Developer',
     'note' => 'Developer tools...',
-    'version' => '14.0.7.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/donations/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_donations',
     'title' => 'Donations',
     'note' => 'Donations custom module.',
-    'version' => '14.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/elasticsearch/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_elasticsearch',
     'title' => 'ElasticSearch',
     'note' => 'Allows to translate content of the site on different languages',
-    'version' => '13.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/english/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_en',
     'title' => 'English',
     'note' => 'Language file',
-    'version' => '14.0.10.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/events/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_events',
     'title' => 'Events',
     'note' => 'Events functionality.',
-    'version' => '14.0.8.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 1 - 1
modules/boonex/events/updates/14.0.8_15.0.0/install/installer.php

@@ -28,7 +28,7 @@ class BxEventsUpdater extends BxDolStudioUpdater
             if(!$this->oDb->isFieldExists('bx_events_prices', 'added'))
                 $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `added` int(11) NOT NULL default '0' AFTER `price`");
             if(!$this->oDb->isFieldExists('bx_events_prices', 'default'))
-                $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `default` tinyint(4) NOT NULL default '0' AFTER `votes`");
+                $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `default` tinyint(4) NOT NULL default '0' AFTER `order`");
             if(!$this->oDb->isFieldExists('bx_events_prices', 'active'))
                 $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `active` tinyint(4) NOT NULL default '1' AFTER `default`");
         }

+ 1 - 1
modules/boonex/events/updates/14.0.8_15.0.0/install/sql/enable.sql

@@ -43,7 +43,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 UPDATE `sys_objects_menu` SET `title_public`='_bx_events_menu_title_public_submenu' WHERE `object`='bx_events_submenu';
 
-DELETE FROM `sys_menu_items` WHERE `set_name`='bx_groups_snippet_meta' AND `name` IN ('votes', 'reactions', 'scores');
+DELETE FROM `sys_menu_items` WHERE `set_name`='bx_events_snippet_meta' AND `name` IN ('votes', 'reactions', 'scores');
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `visibility_custom`, `active`, `copyable`, `editable`, `order`) VALUES
 ('bx_events_snippet_meta', 'bx_events', 'votes', '_sys_menu_item_title_system_sm_votes', '_sys_menu_item_title_sm_votes', '', '', '', '', '', 2147483647, '', 0, 0, 1, 16),
 ('bx_events_snippet_meta', 'bx_events', 'reactions', '_sys_menu_item_title_system_sm_reactions', '_sys_menu_item_title_sm_reactions', '', '', '', '', '', 2147483647, '', 0, 0, 1, 17),

+ 2 - 2
modules/boonex/files/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_files',
     'title' => 'Files',
     'note' => 'Basic blogging module.',
-    'version' => '14.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/fontawesome/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_fontawesome',
     'title' => 'Font Awesome Pro',
     'note' => 'Font Awesome Pro integration.',
-    'version' => '14.0.1.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/forum/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_forum',
     'title' => 'Discussions',
     'note' => 'Discussions module.',
-    'version' => '14.0.7.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/glossary/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_glossary',
     'title' => 'Glossary',
     'note' => 'Glossary module.',
-    'version' => '13.0.4.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/google_connect/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_googlecon',
     'title' => 'Google connect',
     'note' => 'Join the site using LinkedIn account.',
-    'version' => '13.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/google_tagmanager/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_googletagman',
     'title' => 'Google Tag Manager',
     'note' => 'Google Tag Manager replaces hard-coded tags that are used for marketing, analytics, and testing on a website, with dynamic tags that are easier to implement and update.',
-    'version' => '13.0.1.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/groups/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_groups',
     'title' => 'Groups',
     'note' => 'Basic group profiles functionality.',
-    'version' => '14.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/invites/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_invites',
     'title' => 'Invitations',
     'note' => 'Invitations module.',
-    'version' => '14.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 4 - 2
modules/boonex/invites/updates/14.0.5_15.0.0/install/installer.php

@@ -23,9 +23,11 @@ class BxInvUpdater extends BxDolStudioUpdater
             if(!$this->oDb->isFieldExists('bx_inv_invites', 'aj_params'))
                 $this->oDb->query("ALTER TABLE `bx_inv_invites` ADD `aj_params` varchar(255) NOT NULL default '' AFTER `aj_action`");
 
-            $this->oDb->query("UPDATE `bx_inv_invites` SET `aj_action`='redirect', `aj_params`=`redirect` WHERE `redirect`<>''");
-            if($this->oDb->isFieldExists('bx_inv_invites', 'redirect'))
+            if($this->oDb->isFieldExists('bx_inv_invites', 'redirect')) {
+                $this->oDb->query("UPDATE `bx_inv_invites` SET `aj_action`='redirect', `aj_params`=`redirect` WHERE `redirect`<>''");
+
                 $this->oDb->query("ALTER TABLE `bx_inv_invites` DROP COLUMN `redirect`");
+            }
         }
 
         return parent::actionExecuteSql($sOperation);

+ 2 - 2
modules/boonex/lucid/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_lucid',
     'title' => 'Lucid',
     'note' => 'Design template',
-    'version' => '14.0.3.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/market/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_market',
     'title' => 'Market',
     'note' => 'Market module.',
-    'version' => '14.0.8.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/notifications/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_notifications',
     'title' => 'Notifications',
     'note' => 'Notifications module.',
-    'version' => '14.0.9.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/oauth2/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_oauth',
     'title' => 'OAuth2 Server',
     'note' => 'Allow to use site user credentials and basic API',
-    'version' => '14.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/organizations/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_organizations',
     'title' => 'Organizations',
     'note' => 'Basic organization profiles functionality.',
-    'version' => '14.0.9.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/payment/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_payment',
     'title' => 'Payment',
     'note' => 'Payment module.',
-    'version' => '14.0.10.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/persons/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_persons',
     'title' => 'Persons',
     'note' => 'Basic person profiles functionality.',
-    'version' => '14.0.7.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 0
modules/boonex/persons/updates/14.0.6_15.0.0/install/sql/install.sql

@@ -47,6 +47,8 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_person', 'bx_persons', 'badge', 'a:1:{i:0;s:21:"bx_persons_badge_crop";}', 'a:1:{s:21:"bx_persons_badge_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_persons_form_profile_input_sys_badge', '_bx_persons_form_profile_input_badge', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0, ''),
 ('bx_person', 'bx_persons', 'badge_link', '', '', 0, 'text', '_bx_persons_form_profile_input_sys_badge_link', '_bx_persons_form_profile_input_badge_link', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0, '');
 
+UPDATE `sys_form_inputs` SET `type`='datetime' WHERE `object`='bx_person' AND `name`='profile_last_active';
+
 DELETE FROM `sys_form_display_inputs` WHERE `display_name`='bx_person_edit' AND `input_name` IN ('controls', 'do_submit', 'do_cancel');
 SET @iOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_form_display_inputs` WHERE `display_name`='bx_person_edit');
 INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 

+ 2 - 2
modules/boonex/photos/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_photos',
     'title' => 'Photos',
     'note' => 'Basic photo posting module.',
-    'version' => '14.0.3.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/plyr/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_plyr',
     'title' => 'Plyr',
     'note' => 'Plyr player integration.',
-    'version' => '14.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/polls/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_polls',
     'title' => 'Polls',
     'note' => 'Basic poll module.',
-    'version' => '14.0.3.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 1 - 1
modules/boonex/polls/updates/14.0.2_15.0.0/install/sql/enable.sql

@@ -1,2 +1,2 @@
--- MENUS
+-- PAGES
 UPDATE `sys_pages_blocks` SET `designbox_id`='13' WHERE `object`='bx_polls_view_entry' AND `title`='_bx_polls_page_block_title_entry_text_and_subentries';

+ 2 - 2
modules/boonex/posts/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_posts',
     'title' => 'Posts',
     'note' => 'Basic blogging module.',
-    'version' => '14.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/profiler/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_profiler',
     'title' => 'Profiler',
     'note' => 'Measure different site timings.',
-    'version' => '13.0.5.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/protean/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_protean',
     'title' => 'Protean',
     'note' => 'Design template',
-    'version' => '14.0.1.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/quoteofday/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_quoteofday',
     'title' => 'Quote of the Day',
     'note' => 'Quote of the Day module.',
-    'version' => '13.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/russian/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_ru',
     'title' => 'Russian',
     'note' => 'Language file',
-    'version' => '14.0.10.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/shopify/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_shopify',
     'title' => 'Shopify',
     'note' => 'Shopify shopping module.',
-    'version' => '13.0.5.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 1 - 1
modules/boonex/shopify/updates/13.0.4_15.0.0/install/config.php

@@ -10,7 +10,7 @@ $aConfig = array(
      */
     'title' => 'Shopify',
     'version_from' => '13.0.4',
-    'version_to' => '13.0.5',
+    'version_to' => '15.0.0',
     'vendor' => 'UNA INC',
 
     'compatible_with' => array(

+ 2 - 2
modules/boonex/smtpmailer/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_smtp',
     'title' => 'SMTP Mailer',
     'note' => 'Use remote SMTP server for sending mails.',
-    'version' => '14.0.1.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/snipcart/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_snipcart',
     'title' => 'Snipcart',
     'note' => 'Snipcart shopping module.',
-    'version' => '13.0.5.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/spaces/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_spaces',
     'title' => 'Spaces',
     'note' => 'Spaces functionality.',
-    'version' => '14.0.6.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/stream/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_stream',
     'title' => 'Stream',
     'note' => 'Live streaming module.',
-    'version' => '14.0.2.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/stripe_connect/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_stripe_connect',
     'title' => 'Stripe Connect',
     'note' => 'Organize eCommerce platform using Stripe Connect.',
-    'version' => '13.0.4.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'BoonEx',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '13.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/tasks/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_tasks',
     'title' => 'Tasks',
     'note' => 'Tasks module.',
-    'version' => '14.0.1.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/timeline/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_timeline',
     'title' => 'Timeline',
     'note' => 'Timeline module.',
-    'version' => '14.0.10.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/videos/install/config.php

@@ -18,12 +18,12 @@ $aConfig = array(
     'name' => 'bx_videos',
     'title' => 'Videos',
     'note' => 'Basic video posting module.',
-    'version' => '14.0.5.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 2
modules/boonex/xero/install/config.php

@@ -17,12 +17,12 @@ $aConfig = array(
     'name' => 'bx_xero',
     'title' => 'Xero',
     'note' => 'Xero integration module.',
-    'version' => '14.0.1.DEV',
+    'version' => '15.0.1.DEV',
     'vendor' => 'UNA INC',
     'help_url' => 'http://feed.una.io/?section={module_name}',
 
     'compatible_with' => array(
-        '14.0.x'
+        '15.0.x'
     ),
 
     /**

+ 2 - 0
upgrade/files/14.0.0-15.0.0.A1/files/inc/classes/BxDolFormQuery.php

@@ -211,6 +211,8 @@ class BxDolFormQuery extends BxDolDb
 
     static public function getDataItems($sKey, $isUseForSet = false, $sUseValues = BX_DATA_VALUES_DEFAULT)
     {
+        bx_import('BxDolLanguages');
+        
         $oDb = BxDolDb::getInstance();
 
         if(!in_array($sUseValues, array(BX_DATA_VALUES_DEFAULT, BX_DATA_VALUES_ADDITIONAL, BX_DATA_VALUES_ALL)))

+ 9 - 0
upgrade/files/14.0.0-15.0.0.A1/files/inc/classes/BxDolSearch.php

@@ -577,6 +577,8 @@ class BxDolSearchResult implements iBxDolReplaceable
     {
         $sModule = 'system';
         $sUnitType = 'content';
+        $sHomeUrl = '';
+        
         if(!empty($this->oModule)) {
             $sModule = $this->oModule->getName();
 
@@ -584,6 +586,8 @@ class BxDolSearchResult implements iBxDolReplaceable
                  $sUnitType = 'profile';
             if(method_exists($this->oModule, 'serviceIsGroupProfile') && $this->oModule->serviceIsGroupProfile())
                  $sUnitType = 'context';
+            
+            $sHomeUrl = bx_api_get_relative_url(BxDolPermalinks::getInstance()->permalink($this->oModule->_oConfig->CNF['URL_HOME']));
         }
 
         $sUnit =  'list';
@@ -596,7 +600,12 @@ class BxDolSearchResult implements iBxDolReplaceable
             'per_page' => $this->aCurrent['paginate']['perPage'],
             'start' => $this->aCurrent['paginate']['start'],
             'type' => $this->_sMode,
+            'view' => $this->_aParams['unit_view']
         ];
+        
+        if ($sHomeUrl){
+            $aParams['home_url'] = $sHomeUrl;
+        }
 
         foreach(['author', 'category', 'context', 'joined_profile', 'followed_contexts', 'level'] as $sParamAdd)
             if(isset($this->_aParams[$sParamAdd]))

+ 2 - 2
upgrade/files/14.0.0-15.0.0.A1/files/plugins/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'unaio/una',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '9de12135e0fc0b88aff7094e6cbf51573c7976b9',
+        'reference' => '21d4d0e99ef4bebfa6997eb8357535d0d68a6c3b',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -347,7 +347,7 @@
         'unaio/una' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '9de12135e0fc0b88aff7094e6cbf51573c7976b9',
+            'reference' => '21d4d0e99ef4bebfa6997eb8357535d0d68a6c3b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

+ 1 - 1
upgrade/files/14.0.0-15.0.0.A1/files/plugins_public/highlight/highlight.min.js

@@ -1,5 +1,5 @@
 /*!
-  Highlight.js v11.11.1 (git: 9de12135e0)
+  Highlight.js v11.11.1 (git: 21d4d0e99e)
   (c) 2006-2025 Josh Goebel <hello@joshgoebel.com> and other contributors
   License: BSD-3-Clause
  */