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

inc/classes/BxDolProfile.php

@@ -149,8 +149,8 @@ class BxDolProfile extends BxDolFactory implements iBxDolProfile
             'url_avatar' => $oProfile->{isset($aParams['get_avatar']) && method_exists($oProfile, $aParams['get_avatar']) ? $aParams['get_avatar'] : 'getAvatar'}(),
             'module' => $oProfile->getModule(),
         ];
-        
-        if(isset($aParams['with_info']))
+
+        if(isset($aParams['with_info']) && (bool)$aParams['with_info'])
             $aRv['info'] = bx_srv($oProfile->getModule(), 'get_info', [$oProfile->getContentId(), false]);
         
         return $aRv;

inc/classes/BxDolVote.php

@@ -481,6 +481,11 @@ class BxDolVote extends BxDolObject
     	return '';
     }
 
+    protected function _getEmojiDo($bVoted)
+    {
+    	return '';
+    }
+
     protected function _getTitleDo($bVoted)
     {
     	return '';

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -1095,25 +1095,27 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
             return false;
 
         list($iContentId, $aContentInfo) = $mixedContent;
-        if(bx_is_api()){
+
+        if(bx_is_api()) {
+            $CNF = &$this->_oConfig->CNF;
+
             $aContentInfo['cover'] = $this->serviceGetCover($iContentId);
-            $aContentInfo['image'] = $this->serviceGetThumb($iContentId);
-            
-            $CNF = $this->_oConfig->CNF;
-            if(!empty($CNF['OBJECT_MENU_VIEW_ENTRY_META'])){
-                $oMetaMenu = BxTemplMenu::getObjectInstance($CNF['OBJECT_MENU_VIEW_ENTRY_META']);
-                $aContentInfo['meta_menu'] =  $oMetaMenu->getCodeAPI();
-            }
-            if(!empty($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY'])){
-                $oActionMenu = BxTemplMenu::getObjectInstance($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY_ALL']);
-                 $aContentInfo['actions_menu'] = $oActionMenu->getCodeAPI();
-            }  
-            $oProfile = BxDolProfile::getInstanceByContentAndType($iContentId, $this->MODULE);
-            $aContentInfo['profile'] = BxDolProfile::getData($this->_aProfileInfo['id'], [
-                'get_avatar' => 'getAvatarBig',
-                'with_info' => false
-            ]);
-            
+            $aContentInfo['image'] = $this->serviceGetThumb($iContentId);            
+
+            $sKey = 'OBJECT_MENU_VIEW_ENTRY_META';
+            if(!empty($CNF[$sKey]) && ($oMetaMenu = BxTemplMenu::getObjectInstance($CNF[$sKey])) !== false)
+                $aContentInfo['meta_menu'] = $oMetaMenu->getCodeAPI();
+
+            $sKey = 'OBJECT_MENU_ACTIONS_VIEW_ENTRY';
+            if(!empty($CNF[$sKey]) && ($oActionMenu = BxTemplMenu::getObjectInstance($CNF[$sKey])) !== false)
+                $aContentInfo['actions_menu'] = $oActionMenu->getCodeAPI();
+
+            if(($oProfile = BxDolProfile::getInstanceByContentAndType($iContentId, $this->getName())) !== false);
+                $aContentInfo['profile'] = BxDolProfile::getData($oProfile, [
+                    'get_avatar' => 'getAvatarBig',
+                    'with_info' => false
+                ]);
+
             return [bx_api_get_block('entity_cover', $aContentInfo)];
         }
         

modules/boonex/jobs/install/sql/install.sql

@@ -383,14 +383,13 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_job_add', 'location', 2147483647, 1, 5),
 ('bx_job_add', 'date_start', 2147483647, 1, 6),
 ('bx_job_add', 'date_end', 2147483647, 1, 7),
-('bx_job_add', 'timezone', 2147483647, 1, 8),
-('bx_job_add', 'pay_hourly', 2147483647, 1, 9),
-('bx_job_add', 'pay_total', 2147483647, 1, 10),
-('bx_job_add', 'join_confirmation', 2147483647, 1, 11),
-('bx_job_add', 'allow_view_to', 2147483647, 1, 12),
-('bx_job_add', 'allow_post_to', 2147483647, 1, 13),
-('bx_job_add', 'cf', 2147483647, 1, 14),
-('bx_job_add', 'do_submit', 2147483647, 1, 15),
+('bx_job_add', 'pay_hourly', 2147483647, 1, 8),
+('bx_job_add', 'pay_total', 2147483647, 1, 9),
+('bx_job_add', 'join_confirmation', 2147483647, 1, 10),
+('bx_job_add', 'allow_view_to', 2147483647, 1, 11),
+('bx_job_add', 'allow_post_to', 2147483647, 1, 12),
+('bx_job_add', 'cf', 2147483647, 1, 13),
+('bx_job_add', 'do_submit', 2147483647, 1, 14),
 
 ('bx_job_invite', 'initial_members', 2147483647, 1, 1),
 ('bx_job_invite', 'do_submit', 2147483647, 1, 2),
@@ -404,14 +403,13 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_job_edit', 'location', 2147483647, 1, 4),
 ('bx_job_edit', 'date_start', 2147483647, 1, 5),
 ('bx_job_edit', 'date_end', 2147483647, 1, 6),
-('bx_job_edit', 'timezone', 2147483647, 1, 7),
-('bx_job_edit', 'pay_hourly', 2147483647, 1, 8),
-('bx_job_edit', 'pay_total', 2147483647, 1, 9),
-('bx_job_edit', 'join_confirmation', 2147483647, 1, 10),
-('bx_job_edit', 'allow_view_to', 2147483647, 1, 11),
-('bx_job_edit', 'allow_post_to', 2147483647, 1, 12),
-('bx_job_edit', 'cf', 2147483647, 1, 13),
-('bx_job_edit', 'do_submit', 2147483647, 1, 14),
+('bx_job_edit', 'pay_hourly', 2147483647, 1, 7),
+('bx_job_edit', 'pay_total', 2147483647, 1, 8),
+('bx_job_edit', 'join_confirmation', 2147483647, 1, 9),
+('bx_job_edit', 'allow_view_to', 2147483647, 1, 10),
+('bx_job_edit', 'allow_post_to', 2147483647, 1, 11),
+('bx_job_edit', 'cf', 2147483647, 1, 12),
+('bx_job_edit', 'do_submit', 2147483647, 1, 13),
 
 ('bx_job_edit_cover', 'cover', 2147483647, 1, 1),
 ('bx_job_edit_cover', 'do_submit', 2147483647, 1, 2),
@@ -420,20 +418,16 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_job_view', 'cat', 2147483647, 1, 2),
 ('bx_job_view', 'date_start', 2147483647, 1, 3),
 ('bx_job_view', 'date_end', 2147483647, 1, 4),
-('bx_job_view', 'time', 2147483647, 1, 5),
-('bx_job_view', 'timezone', 2147483647, 1, 6),
-('bx_job_view', 'pay_hourly', 2147483647, 1, 7),
-('bx_job_view', 'pay_total', 2147483647, 1, 8),
+('bx_job_view', 'pay_hourly', 2147483647, 1, 5),
+('bx_job_view', 'pay_total', 2147483647, 1, 6),
 
 ('bx_job_view_full', 'name', 2147483647, 1, 1),
 ('bx_job_view_full', 'cat', 2147483647, 1, 2),
 ('bx_job_view_full', 'date_start', 2147483647, 1, 3),
 ('bx_job_view_full', 'date_end', 2147483647, 1, 4),
-('bx_job_view_full', 'time', 2147483647, 1, 5),
-('bx_job_view_full', 'timezone', 2147483647, 1, 6),
-('bx_job_view_full', 'pay_hourly', 2147483647, 1, 7),
-('bx_job_view_full', 'pay_total', 2147483647, 1, 8),
-('bx_job_view_full', 'desc', 2147483647, 1, 9);
+('bx_job_view_full', 'pay_hourly', 2147483647, 1, 5),
+('bx_job_view_full', 'pay_total', 2147483647, 1, 6),
+('bx_job_view_full', 'desc', 2147483647, 1, 7);
 
 -- FORMS: Question
 INSERT INTO `sys_objects_form`(`object`, `module`, `title`, `action`, `form_attrs`, `table`, `key`, `uri`, `uri_title`, `submit_name`, `params`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES