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

inc/version.inc.php

@@ -7,6 +7,6 @@
  * @{
  */
 
-define('BX_DOL_VERSION', '13.1.0-RC2'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
+define('BX_DOL_VERSION', '13.1.0-RC3'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
 
 /** @} */

install/index.php

@@ -10,7 +10,7 @@
 define ('BX_DOL_INSTALL',  true);
 define ('BX_SKIP_INSTALL_CHECK', true);
 
-define ('BX_DOL_VER', '13.1.0-RC2');
+define ('BX_DOL_VER', '13.1.0-RC3');
 
 define ('BX_INSTALL_DEFAULT_LANGUAGE', 'en');
 

modules/base/groups/classes/BxBaseModGroupsMenuViewActionsAll.php

@@ -17,10 +17,22 @@ class BxBaseModGroupsMenuViewActionsAll extends BxBaseModProfileMenuViewActionsA
     public function __construct($aObject, $oTemplate = false)
     {
         parent::__construct($aObject, $oTemplate);
+        
+        $CNF = &$this->_oModule->_oConfig->CNF;
+        
+        if(isset($CNF['OBJECT_CONNECTIONS']))
+            $this->_aConnectionToFunctionCheck[$CNF['OBJECT_CONNECTIONS']] = [
+                'add' => 'checkAllowedFanAdd', 
+                'remove' => 'checkAllowedFanRemove'
+            ];
     }
 
     protected function _getMenuItemProfileFanAdd($aItem)
     {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+        
+        if($this->_bIsApi && $CNF['OBJECT_CONNECTIONS'])
+            return $this->_getMenuItemConnectionApi($CNF['OBJECT_CONNECTIONS'], 'add', $aItem);
         return $this->_getMenuItemByNameActions($aItem);
     }
 
@@ -31,6 +43,10 @@ class BxBaseModGroupsMenuViewActionsAll extends BxBaseModProfileMenuViewActionsA
 
     protected function _getMenuItemProfileFanRemove($aItem)
     {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+        
+        if($this->_bIsApi && $CNF['OBJECT_CONNECTIONS'])
+            return $this->_getMenuItemConnectionApi($CNF['OBJECT_CONNECTIONS'], 'remove', $aItem);
         return $this->_getMenuItemByNameActionsMore($aItem);
     }
 }

upgrade/files/13.1.0.RC2-13.1.0.RC3/check.php

@@ -0,0 +1,14 @@
+<?php
+
+$mixCheckResult = 'Update can not be applied';
+
+if (!(PHP_VERSION_ID >= 70400)) {
+    $mixCheckResult = 'This update requires a PHP version ">= 7.4.0". You are running ' . PHP_VERSION;
+}
+else {
+    $sVer = $this->oDb->getOne("SELECT `version` FROM `sys_modules` WHERE `name` = 'system'");
+    if ('13.1.0.RC2' == $sVer || '13.1.0-RC2' == $sVer)
+        $mixCheckResult = true;
+}
+
+return $mixCheckResult;

upgrade/files/13.1.0.RC2-13.1.0.RC3/files_delete.php

@@ -0,0 +1,13 @@
+<?php
+
+$aFilesDelete = array(
+
+
+//	'plugins/phpmailer/Exception.php',
+//	'plugins/phpmailer/LICENSE',
+//	'plugins/phpmailer/PHPMailer.php',
+//	'plugins/phpmailer/README.md',
+//	'plugins/phpmailer/SMTP.php',
+//	'plugins/phpmailer/VERSION',
+);
+

upgrade/files/13.1.0.RC2-13.1.0.RC3/script.php

@@ -0,0 +1,6 @@
+<?php
+
+    if (!$this->oDb->isFieldExists('sys_objects_page', 'meta_title'))
+        $this->oDb->query("ALTER TABLE `sys_objects_page` ADD `meta_title` varchar(255) NOT NULL AFTER `content_info`");
+
+    return true;

upgrade/files/13.1.0.RC2-13.1.0.RC3/sql.sql

@@ -0,0 +1,27 @@
+
+SET @sStorageEngine = (SELECT `value` FROM `sys_options` WHERE `name` = 'sys_storage_default');
+
+-- Options
+
+SET @iCategoryIdSS = (SELECT `id` FROM `sys_options_categories` WHERE `name` = 'site_settings');
+
+INSERT IGNORE INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
+(@iCategoryIdSS, 'sys_profiles_search_limit', '_adm_stg_cpt_option_sys_profiles_search_limit', '20', 'digit', '', '', '', 23);
+
+-- Menu
+
+UPDATE `sys_objects_menu` SET `override_class_name` = 'BxTemplMenuSubmenuWithAddons' WHERE `object` = 'sys_con_submenu';
+
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:21:"profile_friends_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'friends';
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:36:"profile_recommendation_friends_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'friend-suggestions';
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:30:"profile_friends_requests_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'friend-requests';
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:35:"profile_sent_friends_requests_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'sent-friend-requests';
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:38:"profile_recommendation_following_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'follow-suggestions';
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:23:"profile_followers_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'followers';
+UPDATE `sys_menu_items` SET `addon` = 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:23:"profile_following_count";s:5:"class";s:20:"TemplServiceProfiles";}' WHERE `set_name` = 'sys_con_submenu' AND `name` = 'following';
+
+
+-- Last step is to update current version
+
+UPDATE `sys_modules` SET `version` = '13.1.0-RC3' WHERE (`version` = '13.1.0.RC2' OR `version` = '13.1.0-RC2') AND `name` = 'system';
+