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

inc/classes/BxDolCmts.php

@@ -1073,7 +1073,7 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
             $iGroupProfileId = -(int)$aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']];
             $oProfileContext = BxDolProfile::getInstance($iGroupProfileId);
             $oModule = BxDolModule::getInstance($oProfileContext->getModule()); 
-            if ($oModule->getRole($iGroupProfileId, $this->_getAuthorId()) === BX_BASE_MOD_GROUPS_ROLE_ADMINISTRATOR && $this->checkAction('comments remove in group context', $isPerformAction)){
+            if ($oModule->_oConfig->isRoles() && $oModule->getRole($iGroupProfileId, $this->_getAuthorId()) === BX_BASE_MOD_GROUPS_ROLE_ADMINISTRATOR && $this->checkAction('comments remove in group context', $isPerformAction)){
                 return true;
             }
         }

modules/boonex/russian/data/langs/bx_timeline/ru.xml

@@ -69,6 +69,8 @@
     <string name="_bx_timeline_form_post_input_sys_photo"><![CDATA[Фото]]></string>
     <string name="_bx_timeline_form_post_input_photo"><![CDATA[]]></string>
     <string name="_bx_timeline_form_post_input_photo_alt"><![CDATA[Добавить фото]]></string>
+    <string name="_bx_timeline_form_post_input_sys_files"><![CDATA[Файл]]></string>
+    <string name="_bx_timeline_form_post_input_files"><![CDATA[]]></string>
     <string name="_bx_timeline_form_post_input_sys_video"><![CDATA[Видео]]></string>
     <string name="_bx_timeline_form_post_input_video"><![CDATA[]]></string>
     <string name="_bx_timeline_form_post_input_video_alt"><![CDATA[Добавить видео]]></string>
@@ -239,6 +241,9 @@
     <string name="_bx_timeline_menu_item_title_add_video"><![CDATA[Добавить видео]]></string>
     <string name="_bx_timeline_menu_item_title_system_add_video_record"><![CDATA[Записать видео]]></string>
     <string name="_bx_timeline_menu_item_title_add_video_record"><![CDATA[Записать видео]]></string>
+    <string name="_bx_timeline_menu_item_title_add_file"><![CDATA[Добавить Файл]]></string>
+    <string name="_bx_timeline_menu_item_title_system_add_file_simple"><![CDATA[Добавить Файл (Обычная загрузка)]]></string>
+    <string name="_bx_timeline_menu_item_title_system_add_file_html5"><![CDATA[Добавить Файл (Множественная загрузка)]]></string>
     <string name="_bx_timeline_menu_item_title_system_timeline"><![CDATA[Лента]]></string>
     <string name="_bx_timeline_menu_item_title_timeline"><![CDATA[Лента]]></string>
     <string name="_bx_timeline_menu_item_title_system_create_entry"><![CDATA[Статус]]></string>
@@ -309,6 +314,7 @@
     <string name="_bx_timeline_txt_sample_with_image"><![CDATA[с изображением]]></string>
     <string name="_bx_timeline_txt_sample_with_video"><![CDATA[с видео]]></string>
     <string name="_bx_timeline_txt_sample_with_media"><![CDATA[с медиа]]></string>
+    <string name="_bx_timeline_txt_sample_with_file"><![CDATA[с файлом]]></string>
     <string name="_bx_timeline_txt_today"><![CDATA[Сегодня]]></string>
     <string name="_bx_timeline_txt_some_text_here"><![CDATA[Поделитесь своими мыслями]]></string>
     <string name="_bx_timeline_txt_show"><![CDATA[Показать]]></string>

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -696,16 +696,18 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
         return $this->getTitle($s, $mixedProfile, 'getCharsDisplayMinTitle');
     }
 
-    public function getTitleDefault($bL, $bP, $bV)
+    public function getTitleDefault($bL, $bP, $bV, $bF)
     {
         $sResult = '';
 
-        if($bL && !$bP && !$bV)
+        if($bL && !$bP && !$bV && !$bF)
             $sResult = 'link';
-        else if(!$bL && $bP && !$bV)
+        else if(!$bL && $bP && !$bV && !$bF)
             $sResult = 'image';
-        else if(!$bL && !$bP && $bV)
+        else if(!$bL && !$bP && $bV && !$bF)
             $sResult = 'video';
+        else if(!$bL && !$bP && !$bV && $bF)
+            $sResult = 'file';
         else 
             $sResult = 'media';
 

modules/boonex/timeline/classes/BxTimelineFormPost.php

@@ -57,26 +57,19 @@ class BxTimelineFormPost extends BxBaseModGeneralFormEntry
         if(isset($this->aInputs[$CNF['FIELD_LINK']]))
             $this->aInputs[$CNF['FIELD_LINK']]['content'] = $this->_oModule->_oTemplate->getAttachLinkField($iUserId, $iValueId);
 
-        if(isset($CNF['FIELD_VIDEO']) && isset($this->aInputs[$CNF['FIELD_VIDEO']])) {
-            $aContentInfo = false;
-            if($bValueId) {
-                $aContentInfo = $this->_oModule->_oDb->getContentInfoById ($iValueId);
-                $this->aInputs[$CNF['FIELD_VIDEO']]['content_id'] = $iValueId;
-            }
+        
+        foreach(['FIELD_VIDEO', 'FIELD_FILE'] as $sSetting){
+            if(isset($CNF[$sSetting]) && isset($this->aInputs[$CNF[$sSetting]])) {
+                $aContentInfo = false;
+                if($bValueId) {
+                    $aContentInfo = $this->_oModule->_oDb->getContentInfoById ($iValueId);
+                    $this->aInputs[$CNF[$sSetting]]['content_id'] = $iValueId;
+                }
 
-            $this->aInputs[$CNF['FIELD_VIDEO']]['ghost_template'] = $this->_oModule->_oTemplate->parseHtmlByName($this->_sGhostTemplate, $this->_getGhostTmplVars($CNF['FIELD_VIDEO'], $aContentInfo));
-        }
-		
-		if(isset($CNF['FIELD_FILE']) && isset($this->aInputs[$CNF['FIELD_FILE']])) {
-            $aContentInfo = false;
-            if($bValueId) {
-                $aContentInfo = $this->_oModule->_oDb->getContentInfoById ($iValueId);
-                $this->aInputs[$CNF['FIELD_FILE']]['content_id'] = $iValueId;
+                $this->aInputs[$CNF[$sSetting]]['ghost_template'] = $this->_oModule->_oTemplate->parseHtmlByName($this->_sGhostTemplate, $this->_getGhostTmplVars($CNF['FIELD_VIDEO'], $aContentInfo));
             }
-
-            $this->aInputs[$CNF['FIELD_FILE']]['ghost_template'] = $this->_oModule->_oTemplate->parseHtmlByName($this->_sGhostTemplate, $this->_getGhostTmplVars($CNF['FIELD_FILE'], $aContentInfo));
         }
-	
+       
         if($this->aParams['display'] == $this->_oModule->_oConfig->getObject('form_display_post_edit') && isset($CNF['FIELD_PUBLISHED']) && isset($this->aInputs[$CNF['FIELD_PUBLISHED']]))
             if(isset($aValues[$CNF['FIELD_STATUS']]) && in_array($aValues[$CNF['FIELD_STATUS']], array(BX_TIMELINE_STATUS_ACTIVE, BX_TIMELINE_STATUS_HIDDEN)))
                 unset($this->aInputs[$CNF['FIELD_PUBLISHED']]);

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -2810,7 +2810,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
             	return $this->_prepareResponse(array('form' => $oForm->getCode($bDynamicMode), 'form_id' => $oForm->id), $bAjaxMode);
             }
 
-            $sTitle = $bText ? $this->_oConfig->getTitle($sText) : $this->_oConfig->getTitleDefault($bLinkIds, $bPhotoIds, $bVideoIds);//RLTODO
+            $sTitle = $bText ? $this->_oConfig->getTitle($sText) : $this->_oConfig->getTitleDefault($bLinkIds, $bPhotoIds, $bVideoIds, $bFileIds);
             $sDescription = _t('_bx_timeline_txt_user_added_sample', '{profile_name}', _t('_bx_timeline_txt_sample_with_article'));
 
             /**

modules/boonex/timeline/install/langs/en.xml

@@ -318,6 +318,7 @@
     <string name="_bx_timeline_txt_sample_with_image"><![CDATA[with image]]></string>
     <string name="_bx_timeline_txt_sample_with_video"><![CDATA[with video]]></string>
     <string name="_bx_timeline_txt_sample_with_media"><![CDATA[with media]]></string>
+    <string name="_bx_timeline_txt_sample_with_file"><![CDATA[with file]]></string>
     <string name="_bx_timeline_txt_today"><![CDATA[Today]]></string>
     <string name="_bx_timeline_txt_some_text_here"><![CDATA[Share your thoughts, location, photos or video]]></string>
     <string name="_bx_timeline_txt_show"><![CDATA[Show]]></string>