#5000 Workspaces module: get rid of warnings

modules/base/general/classes/BxBaseModGeneralTemplate.php

@@ -1143,6 +1143,8 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         $sJsName = $sJsCode = '';
         foreach ($aUploaders as $sUploaderObject) {
             $oUploader = BxDolUploader::getObjectInstance($sUploaderObject, $sStorage, $sUniqId, $this);
+            if (!$oUploader)
+                continue;
             $sGhostTemplate = '{file_id}';
 
             $sJsCode .= $oUploader->getUploaderJs($sGhostTemplate, $bAllowMultiple, array_merge($oUploader->getUploaderJsParams(), [
@@ -1163,10 +1165,10 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
             'unique_id' => $sUniqId,
             'id' => $aData['id'],
             'allow_tweak' => $bAllowTweak,
-            'image_exists' => $aData[$sField] == 0 ? 'bx-image-edit-buttons-no-image' : '',
+            'image_exists' => !$sField || $aData[$sField] == 0 ? 'bx-image-edit-buttons-no-image' : '',
             'field' => $sField,
             'action_url' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri(),
-            'uploader' => $oUploader->getUploaderButton([
+            'uploader' => !$oUploader ? '' : $oUploader->getUploaderButton([
                 'content_id' => $aData['id'],
                 'storage_private' => '0',
                 'btn_class' => '',

modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -399,7 +399,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                    'content_id' => $aData[$CNF['FIELD_ID']],
                    'is_allow_edit' => $bIsAllowEditCover,
                    'image_type' => 'cover',
-                   'image_url' => $aData[$CNF['FIELD_COVER']] ? $sUrlCover : '',
+                   'image_url' => $CNF['FIELD_COVER'] && $aData[$CNF['FIELD_COVER']] ? $sUrlCover : '',
                    'uploader' => $CNF['OBJECT_UPLOADERS_COVER'][0],
                    'storage' => $CNF['OBJECT_STORAGE_COVER'],
                    'transcoder' => $CNF['OBJECT_IMAGES_TRANSCODER_COVER'],
@@ -472,7 +472,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                    'content_id' => $aData[$CNF['FIELD_ID']],
                    'is_allow_edit' => $bIsAllowEditPicture,
                    'image_type' => 'avatar',
-                   'image_url' =>  $aData[$CNF['FIELD_PICTURE']] ? $sUrlPicture : '',
+                   'image_url' => $CNF['FIELD_PICTURE'] && $aData[$CNF['FIELD_PICTURE']] ? $sUrlPicture : '',
                    'uploader' => $CNF['OBJECT_UPLOADERS_PICTURE'][0],
                    'storage' => $CNF['OBJECT_STORAGE'],
                    'transcoder' => $CNF['OBJECT_IMAGES_TRANSCODER_AVATAR_BIG'],
@@ -519,10 +519,10 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                 'unique_id' => $sUniqIdPicture,
                 'picture_tweak' => $sPictureTweak, 
                 'cover_settins' => isset($CNF['FIELD_PICTURE_POSITION']) ? $this->_getImageSettings($aData[$CNF['FIELD_PICTURE_POSITION']]) : '',
-                'picture_href' => !$aData[$CNF['FIELD_PICTURE']] && CHECK_ACTION_RESULT_ALLOWED === $oModule->checkAllowedEdit($aData) ? $sUrlPictureChange : 'javascript:void(0);',
+                'picture_href' => (!$CNF['FIELD_PICTURE'] || !$aData[$CNF['FIELD_PICTURE']]) && CHECK_ACTION_RESULT_ALLOWED === $oModule->checkAllowedEdit($aData) ? $sUrlPictureChange : 'javascript:void(0);',
             );
 
-            if($bProfileViewAllowed && $aData[$CNF['FIELD_PICTURE']]) {
+            if($bProfileViewAllowed && $CNF['FIELD_PICTURE'] && $aData[$CNF['FIELD_PICTURE']]) {
                 $sPicturePopup = BxTemplFunctions::getInstance()->transBox($sPicturePopupId, $this->parseHtmlByName('image_popup.html', [
                     'image_url' => $sUrlPicture,
                 ]), true, true);
@@ -743,7 +743,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
     function _image ($sField, $sTranscodeObject, $sNoImage, $aData, $bSubstituteNoImage = true)
     {
         $sImageUrl = false;
-        if ($aData[$sField]) {
+        if (isset($aData[$sField]) && $aData[$sField]) {
             $oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($sTranscodeObject);
             if ($oImagesTranscoder)
                 $sImageUrl = $oImagesTranscoder->getFileUrl($aData[$sField]);

modules/boonex/workspaces/classes/BxWorkspacesConfig.php

@@ -42,11 +42,11 @@ class BxWorkspacesConfig extends BxBaseModProfileConfig
             'FIELD_AUTHOR' => 'author',
             'FIELD_ADDED' => 'added',
             'FIELD_CHANGED' => 'changed',
-            'FIELD_NAME' => 'fullname',
-            'FIELD_TITLE' => 'fullname',
-//            'FIELD_PICTURE' => '',
-//            'FIELD_COVER' => '',
-//            'FIELD_COVER_POSITION' => '',
+            'FIELD_NAME' => '',
+            'FIELD_TITLE' => '',
+            'FIELD_PICTURE' => '',
+            'FIELD_COVER' => '',
+            //'FIELD_COVER_POSITION' => '',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
             'FIELD_ALLOW_POST_TO' => 'allow_post_to',
             'FIELD_ALLOW_CONTACT_TO' => 'allow_contact_to',
@@ -58,7 +58,7 @@ class BxWorkspacesConfig extends BxBaseModProfileConfig
             'FIELD_SCORE_DOWN' => 'sc_down',
             'FIELD_COMMENTS' => 'comments',
             'FIELDS_QUICK_SEARCH' => array(),
-//            'FIELD_LOCATION' => '',
+            'FIELD_LOCATION' => '',
             'FIELD_LOCATION_PREFIX' => '',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified