Ticket #1465 - Failed status.

modules/base/general/classes/BxBaseModGeneralAlertsResponse.php

@@ -28,11 +28,11 @@ class BxBaseModGeneralAlertsResponse extends BxDolAlertsResponse
             return $this->_oModule->_oDb->alterFulltextIndex();
 
         $sKey = 'OBJECT_VIDEOS_TRANSCODERS';
-        if(!empty($CNF[$sKey]) && is_array($CNF[$sKey]) && in_array($oAlert->sUnit, $CNF[$sKey])  && $oAlert->sAction == 'transcoded')
-            return $this->_onVideoTranscoded($oAlert->iObject);
+        if(isset($CNF[$sKey]) && !empty($CNF[$sKey]['mp4']) && strcmp($oAlert->sUnit , $CNF[$sKey]['mp4']) === 0 && $oAlert->sAction == 'transcoded')
+            return $this->_onVideoTranscoded($oAlert->iObject, $oAlert->aExtras['ret']);
     }
 
-    protected function _onVideoTranscoded($iGhostId, $aParams = array())
+    protected function _onVideoTranscoded($iGhostId, $bResult, $aParams = array())
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
@@ -62,21 +62,23 @@ class BxBaseModGeneralAlertsResponse extends BxDolAlertsResponse
 
         if(!isset($aContentInfo[$CNF['FIELD_STATUS']]) || $aContentInfo[$CNF['FIELD_STATUS']] != 'awaiting')
             return;
-        
+
+        if(!$bResult) {
+            if((int)$this->_oModule->_oDb->updateEntriesBy(array($CNF['FIELD_STATUS'] => 'failed'), array($CNF['FIELD_ID'] => $iContentId)) > 0)
+                $this->_oModule->onFailed($iContentId);
+
+            return;
+        }
+
         $iNow = time();
         if(isset($CNF['FIELD_PUBLISHED']) && isset($aContentInfo[$CNF['FIELD_PUBLISHED']]) && $aContentInfo[$CNF['FIELD_PUBLISHED']] > $iNow)
             return;
 
-        $aTranscoders = array();
-        foreach($CNF['OBJECT_VIDEOS_TRANSCODERS'] as $sKey => $sTranscoder)
-            if(in_array($sKey, array('mp4', 'mp4_hd')))
-                $aTranscoders[$sTranscoder] = BxDolTranscoder::getObjectInstance($sTranscoder);
-
+        $oTranscoder = BxDolTranscoder::getObjectInstance($CNF['OBJECT_VIDEOS_TRANSCODERS']['mp4']);
         $aGhostsToCheck = $oStorage->getGhosts($aGhost['profile_id'], $iContentId);
         foreach($aGhostsToCheck as $aGhostToCheck)
-            foreach($aTranscoders as $sTranscoder => $oTranscoder)
-                if(!$oTranscoder->isFileReady($aGhostToCheck['id']))
-                    return;
+            if(!$oTranscoder->isFileReady($aGhostToCheck['id']))
+                return;
 
         if((int)$this->_oModule->_oDb->updateEntriesBy(array($CNF['FIELD_STATUS'] => 'active'), array($CNF['FIELD_ID'] => $iContentId)) > 0)
             $this->_oModule->onPublished($iContentId);

modules/base/general/classes/BxBaseModGeneralFormEntry.php

@@ -149,22 +149,25 @@ class BxBaseModGeneralFormEntry extends BxTemplFormView
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        if (isset($CNF['FIELD_AUTHOR']) && isset($CNF['FIELD_ANONYMOUS']) && isset($this->aInputs[$CNF['FIELD_ANONYMOUS']])) {
-            $aContentInfo = $this->_oModule->_oDb->getContentInfoById ($iContentId);
+        $aContentInfo = $this->_oModule->_oDb->getContentInfoById($iContentId);
+
+        if(isset($CNF['FIELD_AUTHOR']) && isset($CNF['FIELD_ANONYMOUS']) && isset($this->aInputs[$CNF['FIELD_ANONYMOUS']]))
             $aValsToAdd[$CNF['FIELD_AUTHOR']] = ($this->getCleanValue($CNF['FIELD_ANONYMOUS']) ? -1 : 1) * abs($aContentInfo[$CNF['FIELD_AUTHOR']]);
-        }
-        
-        if (isset($CNF['FIELD_CHANGED']) && empty($aValsToAdd[$CNF['FIELD_CHANGED']]) && empty($this->getCleanValue($CNF['FIELD_CHANGED'])))
+
+        if(isset($CNF['FIELD_CHANGED']) && empty($aValsToAdd[$CNF['FIELD_CHANGED']]) && empty($this->getCleanValue($CNF['FIELD_CHANGED'])))
             $aValsToAdd[$CNF['FIELD_CHANGED']] = time();
 
-        if (CHECK_ACTION_RESULT_ALLOWED === $this->_oModule->checkAllowedSetThumb($iContentId) && isset($CNF['FIELD_THUMB'])) {
+        if(CHECK_ACTION_RESULT_ALLOWED === $this->_oModule->checkAllowedSetThumb($iContentId) && isset($CNF['FIELD_THUMB'])) {
             $aThumb = bx_process_input (bx_get($CNF['FIELD_THUMB']), BX_DATA_INT);
             $aValsToAdd[$CNF['FIELD_THUMB']] = 0;
             if (!empty($aThumb) && is_array($aThumb) && ($iFileThumb = array_pop($aThumb)))
                 $aValsToAdd[$CNF['FIELD_THUMB']] = $iFileThumb;
         }
-        
-        return parent::update ($iContentId, $aValsToAdd, $aTrackTextFieldsChanges);
+
+        if(isset($CNF['FIELD_STATUS']) && isset($aContentInfo[$CNF['FIELD_STATUS']]) && $aContentInfo[$CNF['FIELD_STATUS']] == 'failed')
+            $aValsToAdd[$CNF['FIELD_STATUS']] = 'active';
+
+        return parent::update($iContentId, $aValsToAdd, $aTrackTextFieldsChanges);
     }
 
     protected function _associalFileWithContent($oStorage, $iFileId, $iProfileId, $iContentId, $sPictureField = '')

modules/base/general/classes/BxBaseModGeneralFormsEntryHelper.php

@@ -418,17 +418,22 @@ class BxBaseModGeneralFormsEntryHelper extends BxDolProfileForms
 
     public function onDataEditBefore ($iContentId, $aContentInfo, &$aTrackTextFieldsChanges)
     {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        if(isset($CNF['FIELD_STATUS']) && isset($aContentInfo[$CNF['FIELD_STATUS']]) && $aContentInfo[$CNF['FIELD_STATUS']] == 'failed')
+            $aTrackTextFieldsChanges = array();
     }
 
     public function onDataEditAfter ($iContentId, $aContentInfo, $aTrackTextFieldsChanges, $oProfile, $oForm)
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        if (isset($CNF['FIELD_PHOTO']))
+        list($oProfile, $aContentInfo) = $this->_getProfileAndContentData($iContentId);
+
+        if(isset($CNF['FIELD_PHOTO']))
             $oForm->processFiles ($CNF['FIELD_PHOTO'], $iContentId, false);
 
-        if (!empty($CNF['OBJECT_METATAGS'])) { // && isset($aTrackTextFieldsChanges['changed_fields'][$CNF['FIELD_TEXT']])) { // TODO: check if aTrackTextFieldsChanges works 
-            list ($oProfile, $aContentInfo) = $this->_getProfileAndContentData($iContentId);
+        if(!empty($CNF['OBJECT_METATAGS'])) { // && isset($aTrackTextFieldsChanges['changed_fields'][$CNF['FIELD_TEXT']])) { // TODO: check if aTrackTextFieldsChanges works 
             $oMetatags = BxDolMetatags::getObjectInstance($CNF['OBJECT_METATAGS']);
             $oMetatags->metaAddAuto($aContentInfo[$CNF['FIELD_ID']], $aContentInfo, $CNF, $CNF['OBJECT_FORM_ENTRY_DISPLAY_EDIT']);
             if (isset($CNF['FIELD_LOCATION_PREFIX']) && isset($oForm->aInputs[$CNF['FIELD_LOCATION_PREFIX']]) && $oMetatags->locationsIsEnabled())
@@ -440,6 +445,10 @@ class BxBaseModGeneralFormsEntryHelper extends BxDolProfileForms
             }
         }
 
+        if(isset($CNF['FIELD_STATUS']) && isset($aTrackTextFieldsChanges['data'][$CNF['FIELD_STATUS']]) && $aTrackTextFieldsChanges['data'][$CNF['FIELD_STATUS']] == 'failed')
+            if(isset($aContentInfo[$CNF['FIELD_STATUS']]) && $aContentInfo[$CNF['FIELD_STATUS']] == 'active')
+                $this->_alertAfterAdd($aContentInfo);
+
         return '';
     }
 

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -1277,7 +1277,10 @@ class BxBaseModGeneralModule extends BxDolModule
             return '';
     }
 
-	// ====== COMMON METHODS
+    // ====== COMMON METHODS
+    public function onPublished($iContentId) {}
+
+    public function onFailed($iContentId) {}
 
     public function getEntryImageData($aContentInfo, $sField = 'FIELD_THUMB', $aTranscoders = array())
     {

modules/base/text/classes/BxBaseModTextFormsEntryHelper.php

@@ -144,7 +144,7 @@ class BxBaseModTextFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
 
         $sAction = 'added';
         if(isset($CNF['FIELD_STATUS']) && isset($aContentInfo[$CNF['FIELD_STATUS']]) && $aContentInfo[$CNF['FIELD_STATUS']] == 'awaiting')
-            $sAction = 'scheduled';
+            $sAction = 'deferred';
 
         bx_alert($this->_oModule->getName(), $sAction, $iId, $iAuthorId, $aParams);
     }

modules/base/text/classes/BxBaseModTextModule.php

@@ -268,19 +268,34 @@ class BxBaseModTextModule extends BxBaseModGeneralModule implements iBxDolConten
     // ====== COMMON METHODS
     public function onPublished($iContentId)
     {
+        parent::onPublished($iContentId);
+
         $CNF = &$this->_oConfig->CNF;
 
         $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
         if(!$aContentInfo)
-            return MsgBox(_t('_sys_txt_error_occured'));
+            return;
 
         $aParams = array('object_author_id' => $aContentInfo[$CNF['FIELD_AUTHOR']]);
         if(isset($aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]))
             $aParams['privacy_view'] = $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']];
 
         bx_alert($this->getName(), 'added', $iContentId, $aContentInfo[$CNF['FIELD_AUTHOR']], $aParams);
+    }
+
+    public function onFailed($iContentId)
+    {
+        parent::onFailed($iContentId);
+
+        $CNF = &$this->_oConfig->CNF;
+        
+        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
+        if(!$aContentInfo)
+            return;
+
+        $aParams = array('object_author_id' => $aContentInfo[$CNF['FIELD_AUTHOR']]);
 
-        return '';
+        bx_alert($this->getName(), 'failed', $iContentId, $aContentInfo[$CNF['FIELD_AUTHOR']], $aParams);
     }
 
     public function isEntryActive($aContentInfo)

modules/boonex/albums/classes/BxAlbumsAlertsResponse.php

@@ -25,9 +25,9 @@ class BxAlbumsAlertsResponse extends BxBaseModTextAlertsResponse
         parent::response($oAlert);
     }
 
-    protected function _onVideoTranscoded($iGhostId, $aParams = array())
+    protected function _onVideoTranscoded($iGhostId, $bResult, $aParams = array())
     {
-        return parent::_onVideoTranscoded($iGhostId, array('storage' => $this->_oModule->_oConfig->CNF['OBJECT_STORAGE']));
+        return parent::_onVideoTranscoded($iGhostId, $bResult, array('storage' => $this->_oModule->_oConfig->CNF['OBJECT_STORAGE']));
     }
 }
 

modules/boonex/albums/install/sql/enable.sql

@@ -507,5 +507,4 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 ('profile', 'delete', @iHandler),
 
 ('bx_albums_files', 'file_deleted', @iHandler),
-('bx_albums_video_mp4', 'transcoded', @iHandler),
-('bx_albums_video_mp4_hd', 'transcoded', @iHandler);
+('bx_albums_video_mp4', 'transcoded', @iHandler);

modules/boonex/albums/install/sql/install.sql

@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `bx_albums_albums` (
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
-  `status` enum('active','awaiting','hidden') NOT NULL DEFAULT 'active',
+  `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden') NOT NULL DEFAULT 'active',
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_text` (`title`,`text`)

modules/boonex/english/data/langs/system/en.xml

@@ -2633,6 +2633,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_splash_slogan"><![CDATA[The easiest way to create your own social website.]]></string>
         <string name="_sys_status"><![CDATA[Status]]></string>
         <string name="_sys_status_awaiting"><![CDATA[awaiting]]></string>
+        <string name="_sys_status_failed"><![CDATA[failed]]></string>
 	<string name="_sys_storage_err_db"><![CDATA[database error]]></string>
 	<string name="_sys_storage_err_engine_add"><![CDATA[error occurred]]></string>
 	<string name="_sys_storage_err_engine_get"><![CDATA[error occurred]]></string>

modules/boonex/posts/install/sql/enable.sql

@@ -478,8 +478,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 ('system', 'save_setting', @iHandler),
 ('profile', 'delete', @iHandler),
 
-('bx_posts_videos_mp4', 'transcoded', @iHandler),
-('bx_posts_videos_mp4_hd', 'transcoded', @iHandler);
+('bx_posts_videos_mp4', 'transcoded', @iHandler);
 
 
 -- CRON

modules/boonex/posts/install/sql/install.sql

@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS `bx_posts_posts` (
   `featured` int(11) NOT NULL default '0',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `disable_comments` tinyint(4) NOT NULL DEFAULT '0',
-  `status` enum('active','awaiting','hidden') NOT NULL DEFAULT 'active',
+  `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden') NOT NULL DEFAULT 'active',
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_text` (`title`,`text`)

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

@@ -2632,6 +2632,7 @@
 	<string name="_sys_splash_slogan"><![CDATA[Самый простой способ создать свой собственный социальный сайт.]]></string>
         <string name="_sys_status"><![CDATA[Статус]]></string>
         <string name="_sys_status_awaiting"><![CDATA[ожидающий]]></string>
+        <string name="_sys_status_failed"><![CDATA[неудавшийся]]></string>
 	<string name="_sys_storage_err_db"><![CDATA[ошибка базы данных]]></string>
 	<string name="_sys_storage_err_engine_add"><![CDATA[произошла ошибка]]></string>
 	<string name="_sys_storage_err_engine_get"><![CDATA[произошла ошибка]]></string>

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -2730,11 +2730,11 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
         return CHECK_ACTION_RESULT_ALLOWED;
     }
 
-    public function onPost($iId)
+    public function onPost($iContentId)
     {
         $CNF = &$this->_oConfig->CNF;
 
-        $aEvent = $this->_oDb->getEvents(array('browse' => 'id', 'value' => $iId));
+        $aEvent = $this->_oDb->getEvents(array('browse' => 'id', 'value' => $iContentId));
 
         if($this->_oConfig->isSystem($aEvent['type'], $aEvent['action'])) {
             //--- Request event's data from content module and update it in the Timeline DB.
@@ -2748,9 +2748,9 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
             $iSenderId = $iObjectAuthorId = (int)$aEvent['object_id'];
         }
 
-        //--- Event -> Post for Alerts Engine ---//
-        $sAction = ($aEvent[$CNF['FIELD_STATUS']] == BX_TIMELINE_STATUS_AWAITING ? 'schedule' : 'post') . '_' . $sPostType;
-        bx_alert($this->_oConfig->getObject('alert'), $sAction, $iId, $iSenderId, array(
+        //--- Event -> Post/Defer for Alerts Engine ---//
+        $sAction = ($aEvent[$CNF['FIELD_STATUS']] == BX_TIMELINE_STATUS_AWAITING ? 'defer' : 'post') . '_' . $sPostType;
+        bx_alert($this->_oConfig->getObject('alert'), $sAction, $iContentId, $iSenderId, array(
             'owner_id' => $aEvent['owner_id'],
             'object_author_id' => $iObjectAuthorId,
             'privacy_view' => $aEvent['object_privacy_view'],
@@ -2768,14 +2768,42 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
         $this->getCacheItemObject()->removeAllByPrefix($this->_oConfig->getPrefix('cache_item') . $iContentId);
         
         //--- Clear Feed cache
-        $this->_oDb->deleteCache(array('context_id' => $aEvent[$CNF['FIELD_OWNER_ID']])); //--- Delete cache for old context
+        $this->_oDb->deleteCache(array('context_id' => $aEvent[$CNF['FIELD_OWNER_ID']]));
 
         $this->onPost($iContentId);
     }
+    
+    public function onFailed($iContentId)
+    {
+        $aEvent = $this->_oDb->getEvents(array('browse' => 'id', 'value' => $iContentId));
+
+        //--- Clear Item cache
+        $this->getCacheItemObject()->removeAllByPrefix($this->_oConfig->getPrefix('cache_item') . $iContentId);
+
+        if($this->_oConfig->isSystem($aEvent['type'], $aEvent['action'])) {
+            //--- Request event's data from content module and update it in the Timeline DB.
+            $this->_oTemplate->getDataCached($aEvent);
 
-    public function onRepost($iId, $aReposted = array())
+            $sPostType = 'system';
+            $iSenderId = $iObjectAuthorId = (int)$aEvent['owner_id'];
+        } 
+        else {
+            $sPostType = 'common';
+            $iSenderId = $iObjectAuthorId = (int)$aEvent['object_id'];
+        }
+
+        //--- Event -> Fail for Alerts Engine ---//
+        bx_alert($this->_oConfig->getObject('alert'), 'fail_' . $sPostType, $iContentId, $iSenderId, array(
+            'owner_id' => $aEvent['owner_id'],
+            'object_author_id' => $iObjectAuthorId,
+            'privacy_view' => $aEvent['object_privacy_view'],
+        ));
+        //--- Event -> Post for Alerts Engine ---//
+    }
+
+    public function onRepost($iContentId, $aReposted = array())
     {
-        $aEvent = $this->_oDb->getEvents(array('browse' => 'id', 'value' => $iId));
+        $aEvent = $this->_oDb->getEvents(array('browse' => 'id', 'value' => $iContentId));
 
         if(empty($aReposted)) {
             $aContent = unserialize($aEvent['content']);
@@ -2790,12 +2818,11 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
         $this->_oDb->updateRepostCounter($aReposted['id'], $aReposted['reposts']);
 
         //--- Timeline -> Update for Alerts Engine ---//
-        $oAlert = new BxDolAlerts($this->_oConfig->getObject('alert'), 'repost', $aReposted['id'], $iUserId, array(
-        	'privacy_view' => $aEvent['object_privacy_view'],
-        	'object_author_id' => $aReposted['owner_id'],
-        	'repost_id' => $iId,
+        bx_alert($this->_oConfig->getObject('alert'), 'repost', $aReposted['id'], $iUserId, array(
+            'privacy_view' => $aEvent['object_privacy_view'],
+            'object_author_id' => $aReposted['owner_id'],
+            'repost_id' => $iContentId,
         ));
-        $oAlert->alert();
         //--- Timeline -> Update for Alerts Engine ---//
     }
 

modules/boonex/timeline/classes/BxTimelineResponse.php

@@ -136,15 +136,10 @@ class BxTimelineResponse extends BxBaseModNotificationsResponse
 
     protected function _processBxTimelineVideosMp4Transcoded($oAlert)
     {
-        $this->_onVideoTranscoded($oAlert->iObject);
+        $this->_onVideoTranscoded($oAlert->iObject, $oAlert->aExtras['ret']);
     }
 
-    protected function _processBxTimelineVideosMp4HdTranscoded($oAlert)
-    {
-        $this->_onVideoTranscoded($oAlert->iObject);
-    }
-
-    protected function _onVideoTranscoded($iMediaId, $aParams = array())
+    protected function _onVideoTranscoded($iMediaId, $bResult, $aParams = array())
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
@@ -162,21 +157,23 @@ class BxTimelineResponse extends BxBaseModNotificationsResponse
 
         if(!isset($aContentInfo[$CNF['FIELD_STATUS']]) || $aContentInfo[$CNF['FIELD_STATUS']] != 'awaiting')
             return;
-        
+
+        if(!$bResult) {
+            if((int)$this->_oModule->_oDb->updateEntriesBy(array($CNF['FIELD_STATUS'] => 'failed'), array($CNF['FIELD_ID'] => $iContentId)) > 0)
+                $this->_oModule->onFailed($iContentId);
+
+            return;
+        }
+
         $iNow = time();
         if(isset($CNF['FIELD_PUBLISHED']) && isset($aContentInfo[$CNF['FIELD_PUBLISHED']]) && $aContentInfo[$CNF['FIELD_PUBLISHED']] > $iNow)
             return;
 
-        $aTranscoders = array();
-        foreach($CNF['OBJECT_VIDEOS_TRANSCODERS'] as $sKey => $sTranscoder)
-            if(in_array($sKey, array('mp4', 'mp4_hd')))
-                $aTranscoders[$sTranscoder] = BxDolTranscoder::getObjectInstance($sTranscoder);
-
+        $oTranscoder = BxDolTranscoder::getObjectInstance($CNF['OBJECT_VIDEOS_TRANSCODERS']['mp4']);
         $aMediasToCheck = $this->_oModule->_oDb->getMedia(BX_TIMELINE_MEDIA_VIDEO, $iContentId);
         foreach($aMediasToCheck as $iMediaToCheck)
-            foreach($aTranscoders as $sTranscoder => $oTranscoder)
-                if(!$oTranscoder->isFileReady($iMediaToCheck))
-                    return;
+            if(!$oTranscoder->isFileReady($iMediaToCheck))
+                return;
 
         if((int)$this->_oModule->_oDb->updateEntriesBy(array($CNF['FIELD_STATUS'] => 'active'), array($CNF['FIELD_ID'] => $iContentId)) > 0)
             $this->_oModule->onPublished($iContentId);

modules/boonex/timeline/install/sql/enable.sql

@@ -292,8 +292,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 ('system', 'clear_cache', @iHandler),
 ('profile', 'delete', @iHandler),
 
-('bx_timeline_videos_mp4', 'transcoded', @iHandler),
-('bx_timeline_videos_mp4_hd', 'transcoded', @iHandler);
+('bx_timeline_videos_mp4', 'transcoded', @iHandler);
 
 
 -- SEARCH

modules/boonex/timeline/install/sql/install.sql

@@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS `bx_timeline_events` (
   `reposts` int(11) unsigned NOT NULL default '0',
   `date` int(11) NOT NULL default '0',
   `published` int(11) NOT NULL default '0',
-  `status` enum ('active', 'awaiting', 'hidden', 'deleted') NOT NULL DEFAULT 'active',
+  `status` enum ('active', 'awaiting', 'failed', 'hidden', 'deleted') NOT NULL DEFAULT 'active',
   `active` int(11) NOT NULL default '1',
   `pinned` int(11) NOT NULL default '0',
   `sticked` int(11) NOT NULL default '0',

modules/boonex/videos/install/sql/enable.sql

@@ -426,5 +426,4 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 ('system', 'save_setting', @iHandler),
 ('profile', 'delete', @iHandler),
 
-('bx_videos_video_mp4', 'transcoded', @iHandler),
-('bx_videos_video_mp4_hd', 'transcoded', @iHandler);
+('bx_videos_video_mp4', 'transcoded', @iHandler);

modules/boonex/videos/install/sql/install.sql

@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `bx_videos_entries` (
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
-  `status` enum('active','awaiting','hidden') NOT NULL DEFAULT 'active',
+  `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden') NOT NULL DEFAULT 'active',
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_text` (`title`,`text`)