Ticket #3282 - Changes in Glossary, Market, Photos, Polls. Moderation column for all previously updated.

modules/base/text/classes/BxBaseModTextGridCommon.php

@@ -19,20 +19,47 @@ class BxBaseModTextGridCommon extends BxBaseModTextGridAdministration
 
         $this->_sFieldStatus = $CNF['FIELD_STATUS'];
 
+        if($this->_oModule->_oConfig->isAutoApprove() && isset($this->_aFilter1Values[BX_BASE_MOD_TEXT_STATUS_PENDING]))
+            unset($this->_aFilter1Values[BX_BASE_MOD_TEXT_STATUS_PENDING]);
+
         $this->_sManageType = BX_DOL_MANAGE_TOOLS_COMMON;
     }
 
-    protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
+    protected function _getCellSwitcher ($mixedValue, $sKey, $aField, $aRow)
     {
-    	$CNF = $this->_oModule->_oConfig->CNF;
+        if(!$this->_switcherState2Checked($aRow['status_admin']))
+            return parent::_getCellDefault('', $sKey, $aField, $aRow);
 
-		$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `author`=?", bx_get_logged_profile_id());
-		if(!empty($CNF['FIELD_STATUS_ADMIN']))
-			$this->_aOptions['source'] .= " AND `" . $CNF['FIELD_STATUS_ADMIN'] . "`='active'";
+        return parent::_getCellSwitcher ($mixedValue, $sKey, $aField, $aRow);
+    }
+
+    protected function _getCellStatusAdmin($mixedValue, $sKey, $aField, $aRow)
+    {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        if(!empty($CNF['T']['filter_item_' . $mixedValue]))
+            $mixedValue = $CNF['T']['filter_item_' . $mixedValue];
+        else
+            $mixedValue = '_undefined';
+
+        return parent::_getCellDefault(_t($mixedValue), $sKey, $aField, $aRow);
+    }
+
+    protected function _isRowDisabled($aRow)
+    {
+        if(parent::_isRowDisabled($aRow))
+            return true;
+
+        return !$this->_switcherState2Checked($aRow['status_admin']);
+    }
+
+    protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
+    {
+        $this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `author`=?", bx_get_logged_profile_id());
 
         return $this->__getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }
-    
+
     protected function __getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
     {
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);

modules/boonex/ads/classes/BxAdsGridCommon.php

@@ -17,41 +17,6 @@ class BxAdsGridCommon extends BxBaseModTextGridCommon
 
         parent::__construct ($aOptions, $oTemplate);
     }
-
-    protected function _getCellStatusAdmin($mixedValue, $sKey, $aField, $aRow)
-    {
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        if(!empty($CNF['T']['filter_item_' . $mixedValue]))
-            $mixedValue = $CNF['T']['filter_item_' . $mixedValue];
-        else
-            $mixedValue = '_undefined';
-
-        return parent::_getCellDefault(_t($mixedValue), $sKey, $aField, $aRow);
-    }
-
-    protected function _getCellSwitcher ($mixedValue, $sKey, $aField, $aRow)
-    {
-        if(!$this->_switcherState2Checked($aRow['status_admin']))
-            return parent::_getCellDefault('', $sKey, $aField, $aRow);
-
-        return parent::_getCellSwitcher ($mixedValue, $sKey, $aField, $aRow);
-    }
-
-    protected function _isRowDisabled($aRow)
-    {
-        if(parent::_isRowDisabled($aRow))
-            return true;
-
-        return !$this->_switcherState2Checked($aRow['status_admin']);
-    }
-
-    protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
-    {
-        $this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `author`=?", bx_get_logged_profile_id());
-
-        return $this->__getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
-    }
 }
 
 /** @} */

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

@@ -250,6 +250,7 @@
     <string name="_bx_albums_grid_action_title_adm_clear_reports"><![CDATA[Сlear reports]]></string>
     <string name="_bx_albums_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_albums_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
+    <string name="_bx_albums_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_albums_grid_action_err_delete"><![CDATA[Cannot delete the selected album(s).]]></string>
     <string name="_bx_albums_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -517,11 +517,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_albums_administration', 'added', '_bx_albums_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_albums_administration', 'author', '_bx_albums_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_albums_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_albums_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_albums_common', 'switcher', '', '8%', 0, '', '', 2),
 ('bx_albums_common', 'title', '_bx_albums_grid_column_title_adm_title', '40%', 0, '', '', 3),
-('bx_albums_common', 'added', '_bx_albums_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_albums_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_albums_common', 'added', '_bx_albums_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_albums_common', 'status_admin', '_bx_albums_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_albums_common', 'actions', '', '20%', 0, '', '', 6);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_albums_administration', 'bulk', 'delete', '_bx_albums_grid_action_title_adm_delete', '', 0, 1, 1),

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

@@ -223,6 +223,7 @@
     <string name="_bx_classes_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_classes_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_classes_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_classes_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_classes_grid_action_err_delete"><![CDATA[Cannot delete the selected class(s).]]></string>
     <string name="_bx_classes_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

modules/boonex/classes/install/sql/enable.sql

@@ -345,11 +345,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_classes_administration', 'added', '_bx_classes_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_classes_administration', 'author', '_bx_classes_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_classes_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_classes_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_classes_common', 'switcher', '_bx_classes_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_classes_common', 'title', '_bx_classes_grid_column_title_adm_title', '40%', 0, '35', '', 3),
-('bx_classes_common', 'added', '_bx_classes_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_classes_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_classes_common', 'added', '_bx_classes_grid_column_title_adm_added', '150%', 1, '25', '', 4),
+('bx_classes_common', 'status_admin', '_bx_classes_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_classes_common', 'actions', '', '20%', 0, '', '', 6);
 
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
@@ -360,6 +362,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_classes_administration', 'single', 'settings', '_bx_classes_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
 ('bx_classes_administration', 'single', 'audit_content', '_bx_classes_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_classes_administration', 'single', 'clear_reports', '_bx_classes_grid_action_title_adm_clear_reports', 'eraser', 1, 0, 5),
+
 ('bx_classes_common', 'bulk', 'delete', '_bx_classes_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_classes_common', 'single', 'edit', '_bx_classes_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_classes_common', 'single', 'delete', '_bx_classes_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -213,6 +213,7 @@
     <string name="_bx_files_grid_action_title_adm_clear_reports"><![CDATA[Clear reports]]></string>
     <string name="_bx_files_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_files_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
+    <string name="_bx_files_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
   <string name="_bx_files_grid_action_err_delete"><![CDATA[Cannot delete the selected file(s).]]></string>
     <string name="_bx_files_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

modules/boonex/files/install/sql/enable.sql

@@ -470,11 +470,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_files_administration', 'added', '_bx_files_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_files_administration', 'author', '_bx_files_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_files_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_files_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_files_common', 'switcher', '_bx_files_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_files_common', 'title', '_bx_files_grid_column_title_adm_title', '40%', 0, '', '', 3),
-('bx_files_common', 'added', '_bx_files_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_files_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_files_common', 'added', '_bx_files_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_files_common', 'status_admin', '_bx_files_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_files_common', 'actions', '', '20%', 0, '', '', 6);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_files_administration', 'bulk', 'delete', '_bx_files_grid_action_title_adm_delete', '', 0, 1, 1),
@@ -484,6 +486,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_files_administration', 'single', 'settings', '_bx_files_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
 ('bx_files_administration', 'single', 'audit_content', '_bx_files_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_files_administration', 'single', 'clear_reports', '_bx_files_grid_action_title_adm_clear_reports', 'eraser', 1, 0, 5),
+
 ('bx_files_common', 'bulk', 'delete', '_bx_files_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_files_common', 'single', 'edit', '_bx_files_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_files_common', 'single', 'delete', '_bx_files_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -320,6 +320,7 @@
     <string name="_bx_forum_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_forum_grid_action_title_add"><![CDATA[New discussion]]></string>
     <string name="_bx_forum_grid_action_title_show_to"><![CDATA[Show To]]></string>
+    <string name="_bx_forum_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_forum_grid_action_err_delete"><![CDATA[Cannot delete the selected discussion(s).]]></string>
     <string name="_bx_forum_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
     <string name="_bx_forum_grid_txt_manage_visibility"><![CDATA[Manage visibility settings.]]></string>

modules/boonex/forum/install/sql/enable.sql

@@ -432,8 +432,9 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_forum_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_forum_common', 'switcher', '_bx_forum_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_forum_common', 'title', '_bx_forum_grid_column_title_adm_title', '40%', 0, '', '', 3),
-('bx_forum_common', 'added', '_bx_forum_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_forum_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_forum_common', 'added', '_bx_forum_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_forum_common', 'status_admin', '_bx_forum_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_forum_common', 'actions', '', '20%', 0, '', '', 6);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_forum_administration', 'bulk', 'delete', '_bx_forum_grid_action_title_adm_delete', '', 0, 1, 1),

modules/boonex/glossary/classes/BxGlsrConfig.php

@@ -68,6 +68,7 @@ class BxGlsrConfig extends BxBaseModTextConfig
             'URL_MANAGE_ADMINISTRATION' => 'page.php?i=glossary-administration',
 
             // some params
+            'PARAM_AUTO_APPROVE' => 'bx_glossary_enable_auto_approve',
             'PARAM_CHARS_SUMMARY' => 'bx_glossary_summary_chars',
             'PARAM_CHARS_SUMMARY_PLAIN' => 'bx_glossary_plain_summary_chars',
             'PARAM_NUM_RSS' => 'bx_glossary_rss_num',
@@ -118,6 +119,17 @@ class BxGlsrConfig extends BxBaseModTextConfig
                 'bx_glossary_view' => $aMenuItems2Methods,
             ),
 
+            // informer messages
+            'INFORMERS' => array (
+                'approving' => array (
+                    'name' => 'bx-glossary-approving',
+                    'map' => array (
+                        'pending' => array('msg' => '_bx_glossary_txt_msg_status_pending', 'type' => BX_INFORMER_ALERT),
+                        'hidden' => array('msg' => '_bx_glossary_txt_msg_status_hidden', 'type' => BX_INFORMER_ERROR),
+                    ),
+                ),
+            ),
+
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_glossary_txt_sample_single',

modules/boonex/glossary/classes/BxGlsrFormEntry.php

@@ -19,15 +19,6 @@ class BxGlsrFormEntry extends BxBaseModTextFormEntry
         $this->MODULE = 'bx_glossary';
         parent::__construct($aInfo, $oTemplate);
     }
-    
-    public function insert ($aValsToAdd = array(), $isIgnore = false)
-    {
-        if(!BxDolAcl::getInstance()->isMemberLevelInSet(192)){
-            if (getParam('bx_glossary_activate_terms_after_creation') != 'on')
-                $aValsToAdd['status_admin'] = 'pending';  
-        }
-        return parent::insert ($aValsToAdd, $isIgnore);
-    }
 }
 
 /** @} */

modules/boonex/glossary/classes/BxGlsrGridCommon.php

@@ -16,12 +16,6 @@ class BxGlsrGridCommon extends BxBaseModTextGridCommon
         $this->MODULE = 'bx_glossary';
         parent::__construct ($aOptions, $oTemplate);
     }
-    
-    protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
-    {
-		$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `author`=?", bx_get_logged_profile_id());
-        return parent::__getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
-    }
 }
 
 /** @} */

modules/boonex/glossary/classes/BxGlsrPageEntry.php

@@ -27,17 +27,6 @@ class BxGlsrPageEntry extends BxBaseModTextPageEntry
             'icon' => ''
         )));
     }
-    
-    public function getCode ()
-    {
-        $CNF = &$this->_oModule->_oConfig->CNF;
-        if ($this->_aContentInfo[$CNF['FIELD_STATUS_ADMIN']] == 'pending'){
-            $oInformer = BxDolInformer::getInstance($this->_oModule->_oTemplate);
-            if ($oInformer)
-                $oInformer->add('bx-glossary-pending-term', _t('_bx_glossary_txt_term_in_pending_status'), BX_INFORMER_ALERT);
-        }
-        return parent::getCode();
-    }
 }
 
 /** @} */

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

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
 
-	<string name="_bx_glossary"><![CDATA[Glossary]]></string>
-	<string name="_bx_glossary_cmts"><![CDATA[Glossary's Comments]]></string>
-        <string name="_bx_glossary_reactions"><![CDATA[Glossary's Reactions]]></string>
+    <string name="_bx_glossary"><![CDATA[Glossary]]></string>
+    <string name="_bx_glossary_cmts"><![CDATA[Glossary's Comments]]></string>
+    <string name="_bx_glossary_reactions"><![CDATA[Glossary's Reactions]]></string>
 
-	<string name="_bx_glossary_option_summary_chars"><![CDATA[Number of characters in auto-cropped term summary]]></string>
-	<string name="_bx_glossary_option_plain_summary_chars"><![CDATA[Number of characters in plain term description when term hasn't thumb]]></string>
-	<string name="_bx_glossary_option_per_page_browse"><![CDATA[Number of items per page]]></string>
-	<string name="_bx_glossary_option_per_page_profile"><![CDATA[Number of items on profile/group page]]></string>
-	<string name="_bx_glossary_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
-	<string name="_bx_glossary_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
-  <string name="_bx_glossary_option_activate_terms_after_creation"><![CDATA[Activate terms after creation]]></string>
-  <string name="_bx_glossary_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
+    <string name="_bx_glossary_option_enable_auto_approve"><![CDATA[Auto approve a term after creation]]></string>
+    <string name="_bx_glossary_option_summary_chars"><![CDATA[Number of characters in auto-cropped term summary]]></string>
+    <string name="_bx_glossary_option_plain_summary_chars"><![CDATA[Number of characters in plain term description when term hasn't thumb]]></string>
+    <string name="_bx_glossary_option_per_page_browse"><![CDATA[Number of items per page]]></string>
+    <string name="_bx_glossary_option_per_page_profile"><![CDATA[Number of items on profile/group page]]></string>
+    <string name="_bx_glossary_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
+    <string name="_bx_glossary_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
+    <string name="_bx_glossary_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
 
   <string name="_bx_glossary_form_entry"><![CDATA[Glossary]]></string>
 	<string name="_bx_glossary_form_entry_display_add"><![CDATA[Add Term]]></string>
@@ -209,6 +209,7 @@
     <string name="_bx_glossary_grid_action_title_adm_clear_reports"><![CDATA[Clear reports]]></string>
     <string name="_bx_glossary_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_glossary_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>  
+    <string name="_bx_glossary_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_glossary_grid_action_err_delete"><![CDATA[Cannot delete the selected term(s).]]></string>
     <string name="_bx_glossary_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
@@ -242,5 +243,7 @@
     <string name="_bx_glossary_txt_sample_reaction_single"><![CDATA['{0}' reaction to term]]></string>
     <string name="_bx_glossary_txt_sample_score_up_single"><![CDATA[score up vote to term]]></string>
     <string name="_bx_glossary_txt_sample_score_down_single"><![CDATA[score down vote to term]]></string>
-    <string name="_bx_glossary_txt_term_in_pending_status"><![CDATA[This term is pending approval.]]></string>
+
+    <string name="_bx_glossary_txt_msg_status_hidden"><![CDATA[This term was hidden.]]></string>
+    <string name="_bx_glossary_txt_msg_status_pending"><![CDATA[This term is pending approval.]]></string>
 </resources>

modules/boonex/glossary/install/sql/enable.sql

@@ -11,6 +11,7 @@ VALUES (@iTypeId, 'bx_glossary', '_bx_glossary', 1);
 SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_error`, `extra`, `order`) VALUES
+('bx_glossary_enable_auto_approve', 'on', @iCategId, '_bx_glossary_option_enable_auto_approve', 'checkbox', '', '', '', 0),
 ('bx_glossary_summary_chars', '700', @iCategId, '_bx_glossary_option_summary_chars', 'digit', '', '', '', 1),
 ('bx_glossary_plain_summary_chars', '240', @iCategId, '_bx_glossary_option_plain_summary_chars', 'digit', '', '', '', 2),
 ('bx_glossary_per_page_browse', '12', @iCategId, '_bx_glossary_option_per_page_browse', 'digit', '', '', '', 10),
@@ -18,8 +19,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 ('bx_glossary_per_page_browse_showcase', '32', @iCategId, '_sys_option_per_page_browse_showcase', 'digit', '', '', '', 15),
 ('bx_glossary_per_page_for_favorites_lists', '5', @iCategId, '_bx_glossary_option_per_page_for_favorites_lists', 'digit', '', '', '', 17),
 ('bx_glossary_rss_num', '10', @iCategId, '_bx_glossary_option_rss_num', 'digit', '', '', '', 20),
-('bx_glossary_searchable_fields', 'title,text', @iCategId, '_bx_glossary_option_searchable_fields', 'list', '', '', 'a:2:{s:6:"module";s:11:"bx_glossary";s:6:"method";s:21:"get_searchable_fields";}', 30),
-('bx_glossary_activate_terms_after_creation', 'on', @iCategId, '_bx_glossary_option_activate_terms_after_creation', 'checkbox', '', '', '', 40);
+('bx_glossary_searchable_fields', 'title,text', @iCategId, '_bx_glossary_option_searchable_fields', 'list', '', '', 'a:2:{s:6:"module";s:11:"bx_glossary";s:6:"method";s:21:"get_searchable_fields";}', 30);
 
 
 -- PAGE: create entry
@@ -240,6 +240,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_glossary_view_actions', 'bx_glossary', 'edit-glossary', '_bx_glossary_menu_item_title_system_edit_entry', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 10),
 ('bx_glossary_view_actions', 'bx_glossary', 'delete-glossary', '_bx_glossary_menu_item_title_system_delete_entry', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 20),
+('bx_glossary_view_actions', 'bx_glossary', 'approve', '_sys_menu_item_title_system_va_approve', '_sys_menu_item_title_va_approve', 'javascript:void(0)', 'javascript:bx_approve(this, ''{module_uri}'', {content_id});', '', 'check', '', '', 0, 2147483647, 1, 0, 30),
 ('bx_glossary_view_actions', 'bx_glossary', 'comment', '_sys_menu_item_title_system_va_comment', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 200),
 ('bx_glossary_view_actions', 'bx_glossary', 'view', '_sys_menu_item_title_system_va_view', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 210),
 ('bx_glossary_view_actions', 'bx_glossary', 'vote', '_sys_menu_item_title_system_va_vote', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 220),
@@ -452,11 +453,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_glossary_administration', 'added', '_bx_glossary_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_glossary_administration', 'author', '_bx_glossary_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_glossary_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_glossary_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_glossary_common', 'switcher', '_bx_glossary_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_glossary_common', 'title', '_bx_glossary_grid_column_title_adm_title', '40%', 0, '35', '', 3),
-('bx_glossary_common', 'added', '_bx_glossary_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_glossary_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_glossary_common', 'added', '_bx_glossary_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_glossary_common', 'status_admin', '_bx_glossary_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_glossary_common', 'actions', '', '20%', 0, '', '', 6);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_glossary_administration', 'bulk', 'delete', '_bx_glossary_grid_action_title_adm_delete', '', 0, 1, 1),
@@ -466,6 +469,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_glossary_administration', 'single', 'settings', '_bx_glossary_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
 ('bx_glossary_administration', 'single', 'audit_content', '_bx_glossary_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_glossary_administration', 'single', 'clear_reports', '_bx_glossary_grid_action_title_adm_clear_reports', 'eraser', 1, 0, 5),
+
 ('bx_glossary_common', 'bulk', 'delete', '_bx_glossary_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_glossary_common', 'single', 'edit', '_bx_glossary_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_glossary_common', 'single', 'delete', '_bx_glossary_grid_action_title_adm_delete', 'remove', 1, 1, 2),

modules/boonex/market/classes/BxMarketConfig.php

@@ -11,7 +11,7 @@
 
 class BxMarketConfig extends BxBaseModTextConfig
 {
-	protected $_aCurrency;
+    protected $_aCurrency;
 
     function __construct($aModule)
     {
@@ -105,6 +105,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             'URL_VIEW_ENTRY' => 'page.php?i=view-product&id=',
 
             // some params
+            'PARAM_AUTO_APPROVE' => 'bx_market_enable_auto_approve',
             'PARAM_CHARS_SUMMARY' => 'bx_market_summary_chars',
             'PARAM_CHARS_SUMMARY_PLAIN' => 'bx_market_plain_summary_chars',
             'PARAM_NUM_RSS' => 'bx_market_rss_num',
@@ -174,6 +175,17 @@ class BxMarketConfig extends BxBaseModTextConfig
                 'bx_market_snippet_more' => $aMenuItems2Methods,
             ),
 
+            // informer messages
+            'INFORMERS' => array (
+                'approving' => array (
+                    'name' => 'bx-market-approving',
+                    'map' => array (
+                        'pending' => array('msg' => '_bx_market_txt_msg_status_pending', 'type' => BX_INFORMER_ALERT),
+                        'hidden' => array('msg' => '_bx_market_txt_msg_status_hidden', 'type' => BX_INFORMER_ERROR),
+                    ),
+                ),
+            ),
+
             // global settings
             'OPTION_ENABLE_RECURRING' => 'bx_market_enable_recurring',
             'OPTION_RECURRING_RESERVE' => 'bx_market_recurring_reserve',
@@ -195,6 +207,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             	'grid_txt_account_manager' => '_bx_market_grid_txt_account_manager',
                 'filter_item_active' => '_bx_market_grid_filter_item_title_adm_active',
             	'filter_item_hidden' => '_bx_market_grid_filter_item_title_adm_hidden',
+                'filter_item_pending' => '_bx_market_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_market_grid_filter_item_title_adm_select_one_filter1',
             	'menu_item_manage_my' => '_bx_market_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_market_menu_item_title_manage_all',

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

@@ -5,6 +5,7 @@
 	<string name="_bx_market_cmts"><![CDATA[Market's Reviews]]></string>
         <string name="_bx_market_reactions"><![CDATA[Market's Reactions]]></string>
 
+        <string name="_bx_market_option_enable_auto_approve"><![CDATA[Auto approve a product after creation]]></string>
 	<string name="_bx_market_option_enable_recurring"><![CDATA[Allow to sell subscriptions]]></string>
 	<string name="_bx_market_option_recurring_reserve"><![CDATA[Reserve (in days) to accept and process recurring payment notification]]></string>
 	<string name="_bx_market_option_summary_chars"><![CDATA[Number of characters in auto-cropped product summary]]></string>
@@ -13,7 +14,7 @@
 	<string name="_bx_market_option_per_page_profile"><![CDATA[Number of items on profile page]]></string>
 	<string name="_bx_market_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
 	<string name="_bx_market_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
-  <string name="_bx_market_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
+        <string name="_bx_market_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
 
 	<string name="_bx_market_form_entry"><![CDATA[Product]]></string>
 	<string name="_bx_market_form_entry_display_add"><![CDATA[Add Product]]></string>
@@ -334,10 +335,11 @@
     <string name="_bx_market_menu_item_title_products_licenses"><![CDATA[My Licenses]]></string>
     
 
-	<string name="_bx_market_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_market_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_market_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-	<string name="_bx_market_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_market_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_market_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_market_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_market_grid_column_title_adm_author"><![CDATA[Author]]></string>
@@ -346,6 +348,7 @@
     <string name="_bx_market_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_market_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_market_grid_action_title_adm_clear_reports"><![CDATA[Clear reports]]></string>
+    <string name="_bx_market_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_market_grid_action_err_delete"><![CDATA[Cannot delete the selected product(s).]]></string>
     <string name="_bx_market_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
@@ -411,19 +414,21 @@
     <string name="_bx_market_cat_translations"><![CDATA[Translations]]></string>
     <string name="_bx_market_cat_video"><![CDATA[Video]]></string>
 
-	<string name="_bx_market_pre_lists_durations"><![CDATA[Product durations]]></string>
-	<string name="_bx_market_cat_duration_day"><![CDATA[daily]]></string>
-	<string name="_bx_market_cat_duration_week"><![CDATA[weekly]]></string>
-	<string name="_bx_market_cat_duration_month"><![CDATA[monthly]]></string>
-	<string name="_bx_market_cat_duration_year"><![CDATA[yearly]]></string>
+    <string name="_bx_market_pre_lists_durations"><![CDATA[Product durations]]></string>
+    <string name="_bx_market_cat_duration_day"><![CDATA[daily]]></string>
+    <string name="_bx_market_cat_duration_week"><![CDATA[weekly]]></string>
+    <string name="_bx_market_cat_duration_month"><![CDATA[monthly]]></string>
+    <string name="_bx_market_cat_duration_year"><![CDATA[yearly]]></string>
 
     <string name="_bx_market_vote_counter"><![CDATA[{0} ratings]]></string>
 
-	<string name="_bx_market_err_access_denied"><![CDATA[Access denied.]]></string>
-	<string name="_bx_market_err_no_payments"><![CDATA[There is no installed payment processing module.]]></string>
-	<string name="_bx_market_err_not_accept_payments"><![CDATA[You need to activate at least one payment provider. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
-	<string name="_bx_market_err_not_accept_payments_single"><![CDATA[You need to activate at least one payment provider, which is working with Shopping Cart. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
-	<string name="_bx_market_err_not_accept_payments_recurring"><![CDATA[You need to activate at least one payment provider, which is working with Subscriptions. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
+    <string name="_bx_market_txt_msg_status_hidden"><![CDATA[This product was hidden.]]></string>
+    <string name="_bx_market_txt_msg_status_pending"><![CDATA[This product is pending approval.]]></string>
+    <string name="_bx_market_err_access_denied"><![CDATA[Access denied.]]></string>
+    <string name="_bx_market_err_no_payments"><![CDATA[There is no installed payment processing module.]]></string>
+    <string name="_bx_market_err_not_accept_payments"><![CDATA[You need to activate at least one payment provider. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
+    <string name="_bx_market_err_not_accept_payments_single"><![CDATA[You need to activate at least one payment provider, which is working with Shopping Cart. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
+    <string name="_bx_market_err_not_accept_payments_recurring"><![CDATA[You need to activate at least one payment provider, which is working with Subscriptions. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
 
     <string name="_bx_market_txt_all_entries_by"><![CDATA[{0} products]]></string>
     <string name="_bx_market_txt_all_entries_in"><![CDATA[<a href="{0}">All Products in {1} ({2})</a>]]></string>

modules/boonex/market/install/sql/enable.sql

@@ -10,6 +10,7 @@ VALUES (@iTypeId, 'bx_market', '_bx_market', 1);
 SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_error`, `extra`, `order`) VALUES
+('bx_market_enable_auto_approve', 'on', @iCategId, '_bx_market_option_enable_auto_approve', 'checkbox', '', '', '', 0),
 ('bx_market_enable_recurring', 'on', @iCategId, '_bx_market_option_enable_recurring', 'checkbox', '', '', '', 1),
 ('bx_market_recurring_reserve', '4', @iCategId, '_bx_market_option_recurring_reserve', 'digit', '', '', '', 2),
 ('bx_market_summary_chars', '700', @iCategId, '_bx_market_option_summary_chars', 'digit', '', '', '', 10),
@@ -293,7 +294,8 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_market_view_actions', 'bx_market', 'hide-product', '_bx_market_menu_item_title_system_hide_entry', '', '', '', '', '', '', '', 0, 2147483647, '', 1, 0, 50),
 ('bx_market_view_actions', 'bx_market', 'edit-product', '_bx_market_menu_item_title_system_edit_entry', '', '', '', '', '', '', '', 0, 2147483647, '', 1, 0, 60),
 ('bx_market_view_actions', 'bx_market', 'delete-product', '_bx_market_menu_item_title_system_delete_entry', '', '', '', '', '', '', '', 0, 2147483647, '', 1, 0, 70),
-('bx_market_view_actions', 'bx_market', 'set-badges', '_sys_menu_item_title_system_set_badges', '_sys_menu_item_title_set_badges', 'javascript:void(0)', 'bx_menu_popup(''sys_set_badges'', window, {}, {module: ''bx_market'', content_id: {content_id}});', '', 'check-circle', '', '', 0, 2147483647, 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:19:"is_badges_avaliable";}', 1, 0, 80),
+('bx_market_view_actions', 'bx_market', 'approve', '_sys_menu_item_title_system_va_approve', '_sys_menu_item_title_va_approve', 'javascript:void(0)', 'javascript:bx_approve(this, ''{module_uri}'', {content_id});', '', 'check', '', '', 0, 2147483647, '', 1, 0, 80),
+('bx_market_view_actions', 'bx_market', 'set-badges', '_sys_menu_item_title_system_set_badges', '_sys_menu_item_title_set_badges', 'javascript:void(0)', 'bx_menu_popup(''sys_set_badges'', window, {}, {module: ''bx_market'', content_id: {content_id}});', '', 'check-circle', '', '', 0, 2147483647, 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:19:"is_badges_avaliable";}', 1, 0, 90),
 ('bx_market_view_actions', 'bx_market', 'comment', '_sys_menu_item_title_system_va_comment', '', '', '', '', '', '', '', 0, 2147483647, '', 0, 0, 200),
 ('bx_market_view_actions', 'bx_market', 'view', '_sys_menu_item_title_system_va_view', '', '', '', '', '', '', '', 0, 2147483647, '', 1, 0, 210),
 ('bx_market_view_actions', 'bx_market', 'vote', '_sys_menu_item_title_system_va_vote', '', '', '', '', '', '', '', 0, 2147483647, '', 0, 0, 220),
@@ -596,8 +598,9 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_market_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_market_common', 'switcher', '_bx_market_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_market_common', 'title', '_bx_market_grid_column_title_adm_title', '40%', 0, '', '', 3),
-('bx_market_common', 'added', '_bx_market_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_market_common', 'actions', '', '20%', 0, '', '', 5),
+('bx_market_common', 'added', '_bx_market_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_market_common', 'status_admin', '_bx_market_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_market_common', 'actions', '', '20%', 0, '', '', 6),
 
 ('bx_market_licenses_administration', 'profile_id', '_bx_market_grid_column_title_lcs_profile_id', '10%', 0, '28', '', 1),
 ('bx_market_licenses_administration', 'product', '_bx_market_grid_column_title_lcs_product', '20%', 0, '28', '', 2),
@@ -626,6 +629,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_market_administration', 'single', 'settings', '_bx_market_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
 ('bx_market_administration', 'single', 'audit_content', '_bx_market_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_market_administration', 'single', 'clear_reports', '_bx_market_grid_action_title_adm_clear_reports', 'eraser', 1, 0, 5),
+
 ('bx_market_common', 'bulk', 'delete', '_bx_market_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_market_common', 'single', 'edit', '_bx_market_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_market_common', 'single', 'delete', '_bx_market_grid_action_title_adm_delete', 'remove', 1, 1, 2),

modules/boonex/market/install/sql/install.sql

@@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS `bx_market_products` (
   `allow_comment_to` varchar(32) NOT NULL DEFAULT 'c',
   `allow_vote_to` varchar(32) NOT NULL DEFAULT 'c',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
-  `status_admin` enum('active','hidden') NOT NULL DEFAULT 'active',
+  `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`(191)),
   FULLTEXT KEY `title_text` (`title`,`text`)

modules/boonex/photos/classes/BxPhotosConfig.php

@@ -76,6 +76,7 @@ class BxPhotosConfig extends BxBaseModTextConfig
             'URL_MANAGE_ADMINISTRATION' => 'page.php?i=photos-administration',
 
             // some params
+            'PARAM_AUTO_APPROVE' => 'bx_photos_enable_auto_approve',
             'PARAM_CHARS_SUMMARY' => 'bx_photos_summary_chars',
             'PARAM_CHARS_SUMMARY_PLAIN' => 'bx_photos_plain_summary_chars',
             'PARAM_NUM_RSS' => 'bx_photos_rss_num',
@@ -129,6 +130,17 @@ class BxPhotosConfig extends BxBaseModTextConfig
                 'bx_photos_view' => $aMenuItems2Methods,
             ),
 
+            // informer messages
+            'INFORMERS' => array (
+                'approving' => array (
+                    'name' => 'bx-photos-approving',
+                    'map' => array (
+                        'pending' => array('msg' => '_bx_photos_txt_msg_status_pending', 'type' => BX_INFORMER_ALERT),
+                        'hidden' => array('msg' => '_bx_photos_txt_msg_status_hidden', 'type' => BX_INFORMER_ERROR),
+                    ),
+                ),
+            ),
+
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_photos_txt_sample_single',
@@ -144,6 +156,7 @@ class BxPhotosConfig extends BxBaseModTextConfig
             	'grid_txt_account_manager' => '_bx_photos_grid_txt_account_manager',
                 'filter_item_active' => '_bx_photos_grid_filter_item_title_adm_active',
             	'filter_item_hidden' => '_bx_photos_grid_filter_item_title_adm_hidden',
+                'filter_item_pending' => '_bx_photos_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_photos_grid_filter_item_title_adm_select_one_filter1',
             	'menu_item_manage_my' => '_bx_photos_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_photos_menu_item_title_manage_all',

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

@@ -5,6 +5,7 @@
     <string name="_bx_photos_cmts"><![CDATA[Photos' Comments]]></string>
     <string name="_bx_photos_reactions"><![CDATA[Photos' Reactions]]></string>
 
+    <string name="_bx_photos_option_enable_auto_approve"><![CDATA[Auto approve a photo after creation]]></string>
     <string name="_bx_photos_option_summary_chars"><![CDATA[Number of characters in auto-cropped photo summary]]></string>
     <string name="_bx_photos_option_plain_summary_chars"><![CDATA[Number of characters in plain photo description when photo hasn't thumb]]></string>
     <string name="_bx_photos_option_per_page_browse"><![CDATA[Number of items per page]]></string>
@@ -194,21 +195,22 @@
     <string name="_bx_photos_menu_item_title_view_entries_in_context"><![CDATA[Photos]]></string>
     <string name="_bx_photos_menu_title_entries_my"><![CDATA[My Photos Action Menu]]></string>
     <string name="_bx_photos_menu_set_title_entries_my"><![CDATA[My Photos Menu]]></string>
-	<string name="_bx_photos_menu_item_title_system_manage_my_photos"><![CDATA[My photos]]></string>
+    <string name="_bx_photos_menu_item_title_system_manage_my_photos"><![CDATA[My photos]]></string>
     <string name="_bx_photos_menu_item_title_manage_my_photos"><![CDATA[Photos]]></string>
     <string name="_bx_photos_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_photos_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_photos_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_photos_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_photos_menu_item_title_system_admt_photos"><![CDATA[Photos]]></string>
-	<string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Photos]]></string>
-	<string name="_bx_photos_menu_item_title_manage_my"><![CDATA[My Photos]]></string>
-	<string name="_bx_photos_menu_item_title_manage_all"><![CDATA[All Photos]]></string>
+    <string name="_bx_photos_menu_item_title_system_admt_photos"><![CDATA[Photos]]></string>
+    <string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Photos]]></string>
+    <string name="_bx_photos_menu_item_title_manage_my"><![CDATA[My Photos]]></string>
+    <string name="_bx_photos_menu_item_title_manage_all"><![CDATA[All Photos]]></string>
 
-	<string name="_bx_photos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_photos_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_photos_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-	<string name="_bx_photos_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_photos_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_photos_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_photos_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_photos_grid_column_title_adm_author"><![CDATA[Author]]></string>
@@ -217,6 +219,7 @@
     <string name="_bx_photos_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_photos_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_photos_grid_action_title_adm_clear_reports"><![CDATA[Clear reports]]></string>
+    <string name="_bx_photos_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_photos_grid_action_err_delete"><![CDATA[Cannot delete the selected photo(s).]]></string>
     <string name="_bx_photos_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
@@ -256,4 +259,7 @@
     <string name="_bx_photos_txt_shutter_speed"><![CDATA[Exposure time]]></string>
     <string name="_bx_photos_txt_shutter_speed_value"><![CDATA[{0}s]]></string>
     <string name="_bx_photos_txt_iso"><![CDATA[ISO]]></string>
+
+    <string name="_bx_photos_txt_msg_status_hidden"><![CDATA[This photo was hidden.]]></string>
+    <string name="_bx_photos_txt_msg_status_pending"><![CDATA[This photo is pending approval.]]></string>
 </resources>

modules/boonex/photos/install/sql/enable.sql

@@ -10,6 +10,7 @@ VALUES (@iTypeId, 'bx_photos', '_bx_photos', 1);
 SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_error`, `extra`, `order`) VALUES
+('bx_photos_enable_auto_approve', 'on', @iCategId, '_bx_photos_option_enable_auto_approve', 'checkbox', '', '', '', 0),
 ('bx_photos_summary_chars', '700', @iCategId, '_bx_photos_option_summary_chars', 'digit', '', '', '', 1),
 ('bx_photos_plain_summary_chars', '240', @iCategId, '_bx_photos_option_plain_summary_chars', 'digit', '', '', '', 2),
 ('bx_photos_per_page_browse', '12', @iCategId, '_bx_photos_option_per_page_browse', 'digit', '', '', '', 10),
@@ -224,6 +225,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_photos_view_actions', 'bx_photos', 'edit-photo', '_bx_photos_menu_item_title_system_edit_entry', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 10),
 ('bx_photos_view_actions', 'bx_photos', 'delete-photo', '_bx_photos_menu_item_title_system_delete_entry', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 20),
+('bx_photos_view_actions', 'bx_photos', 'approve', '_sys_menu_item_title_system_va_approve', '_sys_menu_item_title_va_approve', 'javascript:void(0)', 'javascript:bx_approve(this, ''{module_uri}'', {content_id});', '', 'check', '', '', 0, 2147483647, 1, 0, 30),
 ('bx_photos_view_actions', 'bx_photos', 'comment', '_sys_menu_item_title_system_va_comment', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 200),
 ('bx_photos_view_actions', 'bx_photos', 'view', '_sys_menu_item_title_system_va_view', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 210),
 ('bx_photos_view_actions', 'bx_photos', 'vote', '_sys_menu_item_title_system_va_vote', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 220),
@@ -438,11 +440,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_photos_administration', 'added', '_bx_photos_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_photos_administration', 'author', '_bx_photos_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_photos_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_photos_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_photos_common', 'switcher', '_bx_photos_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_photos_common', 'title', '_bx_photos_grid_column_title_adm_title', '40%', 0, '35', '', 3),
-('bx_photos_common', 'added', '_bx_photos_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_photos_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_photos_common', 'added', '_bx_photos_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_photos_common', 'status_admin', '_bx_photos_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_photos_common', 'actions', '', '20%', 0, '', '', 6);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_photos_administration', 'bulk', 'delete', '_bx_photos_grid_action_title_adm_delete', '', 0, 1, 1),

modules/boonex/photos/install/sql/install.sql

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

modules/boonex/polls/classes/BxPollsConfig.php

@@ -75,6 +75,7 @@ class BxPollsConfig extends BxBaseModTextConfig
             'URL_MANAGE_ADMINISTRATION' => 'page.php?i=polls-administration',
 
             // some params
+            'PARAM_AUTO_APPROVE' => 'bx_polls_enable_auto_approve',
             'PARAM_CHARS_TITLE' => 'bx_polls_title_chars',
             'PARAM_CHARS_SUMMARY' => '',
             'PARAM_CHARS_SUMMARY_PLAIN' => '',
@@ -132,6 +133,17 @@ class BxPollsConfig extends BxBaseModTextConfig
                 'bx_polls_view' => $aMenuItems2Methods,
             ),
 
+            // informer messages
+            'INFORMERS' => array (
+                'approving' => array (
+                    'name' => 'bx-polls-approving',
+                    'map' => array (
+                        'pending' => array('msg' => '_bx_polls_txt_msg_status_pending', 'type' => BX_INFORMER_ALERT),
+                        'hidden' => array('msg' => '_bx_polls_txt_msg_status_hidden', 'type' => BX_INFORMER_ERROR),
+                    ),
+                ),
+            ),
+
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_polls_txt_sample_single',
@@ -146,6 +158,7 @@ class BxPollsConfig extends BxBaseModTextConfig
                 'grid_txt_account_manager' => '_bx_polls_grid_txt_account_manager',
                 'filter_item_active' => '_bx_polls_grid_filter_item_title_adm_active',
                 'filter_item_hidden' => '_bx_polls_grid_filter_item_title_adm_hidden',
+                'filter_item_pending' => '_bx_polls_grid_filter_item_title_adm_pending',
                 'filter_item_select_one_filter1' => '_bx_polls_grid_filter_item_title_adm_select_one_filter1',
                 'menu_item_manage_my' => '_bx_polls_menu_item_title_manage_my',
                 'menu_item_manage_all' => '_bx_polls_menu_item_title_manage_all',

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

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
 
-	<string name="_bx_polls"><![CDATA[Polls]]></string>
-	<string name="_bx_polls_cmts"><![CDATA[Polls' Comments]]></string>
+        <string name="_bx_polls"><![CDATA[Polls]]></string>
+        <string name="_bx_polls_cmts"><![CDATA[Polls' Comments]]></string>
         <string name="_bx_polls_reactions"><![CDATA[Polls' Reactions]]></string>
 
-	<string name="_bx_polls_option_title_chars"><![CDATA[Number of characters in auto-cropped poll title]]></string>
-	<string name="_bx_polls_option_per_page_browse"><![CDATA[Number of items per page]]></string>
-	<string name="_bx_polls_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
-	<string name="_bx_polls_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
-  <string name="_bx_polls_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
+        <string name="_bx_polls_option_enable_auto_approve"><![CDATA[Auto approve a poll after creation]]></string>
+        <string name="_bx_polls_option_title_chars"><![CDATA[Number of characters in auto-cropped poll title]]></string>
+        <string name="_bx_polls_option_per_page_browse"><![CDATA[Number of items per page]]></string>
+        <string name="_bx_polls_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
+        <string name="_bx_polls_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
+        <string name="_bx_polls_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
 
 
-  <string name="_bx_polls_form_entry"><![CDATA[Polls]]></string>
+        <string name="_bx_polls_form_entry"><![CDATA[Polls]]></string>
 	<string name="_bx_polls_form_entry_display_add"><![CDATA[Add Poll]]></string>
 	<string name="_bx_polls_form_entry_display_edit"><![CDATA[Edit Poll]]></string>
 	<string name="_bx_polls_form_entry_display_delete"><![CDATA[Delete Poll]]></string>
@@ -24,7 +25,7 @@
 	<string name="_bx_polls_form_entry_input_do_publish"><![CDATA[Publish]]></string>
 	<string name="_bx_polls_form_entry_input_sys_cat"><![CDATA[Category]]></string>
 	<string name="_bx_polls_form_entry_input_cat"><![CDATA[Category]]></string>
-    <string name="_bx_polls_form_entry_input_cat_err"><![CDATA[Please select category]]></string>
+        <string name="_bx_polls_form_entry_input_cat_err"><![CDATA[Please select category]]></string>
 	<string name="_bx_polls_form_entry_input_sys_text"><![CDATA[Question]]></string>
 	<string name="_bx_polls_form_entry_input_text"><![CDATA[Question]]></string>
 	<string name="_bx_polls_form_entry_input_text_err"><![CDATA[Question is essential. Please, fill in this field]]></string>
@@ -203,6 +204,7 @@
 	<string name="_bx_polls_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
 	<string name="_bx_polls_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
 	<string name="_bx_polls_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+        <string name="_bx_polls_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
 	<string name="_bx_polls_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_polls_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_polls_grid_column_title_adm_added"><![CDATA[Added]]></string>
@@ -212,6 +214,7 @@
     <string name="_bx_polls_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_polls_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_polls_grid_action_title_adm_clear_reports"><![CDATA[Clear reports]]></string>
+    <string name="_bx_polls_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_polls_grid_action_err_delete"><![CDATA[Cannot delete the selected poll(s).]]></string>
     <string name="_bx_polls_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
@@ -256,4 +259,7 @@
     <string name="_bx_polls_txt_subentry_vote_counter"><![CDATA[{0} votes]]></string>
     <string name="_bx_polls_txt_subentry_vote_percent"><![CDATA[({0}%)]]></string>
     <string name="_bx_polls_msg_public_voting"><![CDATA[This voting is public, your choice will be displayed for others.]]></string>
+    
+    <string name="_bx_polls_txt_msg_status_hidden"><![CDATA[This poll was hidden.]]></string>
+    <string name="_bx_polls_txt_msg_status_pending"><![CDATA[This poll is pending approval.]]></string>
 </resources>

modules/boonex/polls/install/sql/enable.sql

@@ -1,6 +1,5 @@
 
 -- SETTINGS
-
 SET @iTypeOrder = (SELECT MAX(`order`) FROM `sys_options_types` WHERE `group` = 'modules');
 INSERT INTO `sys_options_types`(`group`, `name`, `caption`, `icon`, `order`) VALUES 
 ('modules', 'bx_polls', '_bx_polls', 'bx_polls@modules/boonex/polls/|std-icon.svg', IF(ISNULL(@iTypeOrder), 1, @iTypeOrder + 1));
@@ -11,6 +10,7 @@ VALUES (@iTypeId, 'bx_polls', '_bx_polls', 1);
 SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_error`, `extra`, `order`) VALUES
+('bx_polls_enable_auto_approve', 'on', @iCategId, '_bx_polls_option_enable_auto_approve', 'checkbox', '', '', '', 0),
 ('bx_polls_title_chars', '200', @iCategId, '_bx_polls_option_title_chars', 'digit', '', '', '', 1),
 ('bx_polls_per_page_browse', '12', @iCategId, '_bx_polls_option_per_page_browse', 'digit', '', '', '', 10),
 ('bx_polls_per_page_browse_showcase', '32', @iCategId, '_sys_option_per_page_browse_showcase', 'digit', '', '', '', 15),
@@ -221,6 +221,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_polls_view_actions', 'bx_polls', 'edit-poll', '_bx_polls_menu_item_title_system_edit_entry', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 10),
 ('bx_polls_view_actions', 'bx_polls', 'delete-poll', '_bx_polls_menu_item_title_system_delete_entry', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 20),
+('bx_polls_view_actions', 'bx_polls', 'approve', '_sys_menu_item_title_system_va_approve', '_sys_menu_item_title_va_approve', 'javascript:void(0)', 'javascript:bx_approve(this, ''{module_uri}'', {content_id});', '', 'check', '', '', 0, 2147483647, 1, 0, 30),
 ('bx_polls_view_actions', 'bx_polls', 'comment', '_sys_menu_item_title_system_va_comment', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 200),
 ('bx_polls_view_actions', 'bx_polls', 'view', '_sys_menu_item_title_system_va_view', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 210),
 ('bx_polls_view_actions', 'bx_polls', 'vote', '_sys_menu_item_title_system_va_vote', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 220),
@@ -444,11 +445,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_polls_administration', 'added', '_bx_polls_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_polls_administration', 'author', '_bx_polls_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_polls_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_polls_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_polls_common', 'switcher', '_bx_polls_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_polls_common', 'text', '_bx_polls_grid_column_title_adm_title', '40%', 0, '35', '', 3),
-('bx_polls_common', 'added', '_bx_polls_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_polls_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_polls_common', 'added', '_bx_polls_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_polls_common', 'status_admin', '_bx_polls_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_polls_common', 'actions', '', '20%', 0, '', '', 6);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_polls_administration', 'bulk', 'delete', '_bx_polls_grid_action_title_adm_delete', '', 0, 1, 1),
@@ -458,6 +461,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_polls_administration', 'single', 'settings', '_bx_polls_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
 ('bx_polls_administration', 'single', 'audit_content', '_bx_polls_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_polls_administration', 'single', 'clear_reports', '_bx_polls_grid_action_title_adm_clear_reports', 'eraser', 1, 0, 5),
+
 ('bx_polls_common', 'bulk', 'delete', '_bx_polls_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_polls_common', 'single', 'edit', '_bx_polls_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_polls_common', 'single', 'delete', '_bx_polls_grid_action_title_adm_delete', 'remove', 1, 1, 2),

modules/boonex/polls/install/sql/install.sql

@@ -1,6 +1,3 @@
-
-SET @sStorageEngine = (SELECT `value` FROM `sys_options` WHERE `name` = 'sys_storage_default');
-
 -- TABLE: entries
 CREATE TABLE IF NOT EXISTS `bx_polls_entries` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -28,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `bx_polls_entries` (
   `anonymous` tinyint(4) NOT NULL DEFAULT '0',
   `hidden_results` tinyint(4) NOT NULL DEFAULT '0',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
-  `status_admin` enum('active','hidden') NOT NULL DEFAULT 'active',
+  `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
   PRIMARY KEY (`id`),
   FULLTEXT KEY `search_fields` (`text`)
 );
@@ -271,6 +268,8 @@ CREATE TABLE IF NOT EXISTS `bx_polls_scores_track` (
 
 
 -- STORAGES & TRANSCODERS
+SET @sStorageEngine = (SELECT `value` FROM `sys_options` WHERE `name` = 'sys_storage_default');
+
 INSERT INTO `sys_objects_storage` (`object`, `engine`, `params`, `token_life`, `cache_control`, `levels`, `table_files`, `ext_mode`, `ext_allow`, `ext_deny`, `quota_size`, `current_size`, `quota_number`, `current_number`, `max_file_size`, `ts`) VALUES
 ('bx_polls_files', @sStorageEngine, '', 360, 2592000, 3, 'bx_polls_files', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0),
 ('bx_polls_photos_resized', @sStorageEngine, '', 360, 2592000, 3, 'bx_polls_photos_resized', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0);

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

@@ -275,6 +275,7 @@
     <string name="_bx_posts_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_posts_grid_action_title_adm_clear_reports"><![CDATA[Сlear reports]]></string>
     <string name="_bx_posts_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_posts_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
     <string name="_bx_posts_grid_action_err_delete"><![CDATA[Cannot delete the selected post(s).]]></string>
     <string name="_bx_posts_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -478,11 +478,13 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_posts_administration', 'added', '_bx_posts_grid_column_title_adm_added', '20%', 1, '25', '', 5),
 ('bx_posts_administration', 'author', '_bx_posts_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_posts_administration', 'actions', '', '20%', 0, '', '', 7),
+
 ('bx_posts_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_posts_common', 'switcher', '_bx_posts_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_posts_common', 'title', '_bx_posts_grid_column_title_adm_title', '40%', 0, '35', '', 3),
-('bx_posts_common', 'added', '_bx_posts_grid_column_title_adm_added', '30%', 1, '25', '', 4),
-('bx_posts_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_posts_common', 'added', '_bx_posts_grid_column_title_adm_added', '15%', 1, '25', '', 4),
+('bx_posts_common', 'status_admin', '_bx_posts_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
+('bx_posts_common', 'actions', '', '20%', 0, '', '', 6);
 
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
@@ -493,6 +495,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_posts_administration', 'single', 'settings', '_bx_posts_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
 ('bx_posts_administration', 'single', 'audit_content', '_bx_posts_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_posts_administration', 'single', 'clear_reports', '_bx_posts_grid_action_title_adm_clear_reports', 'eraser', 1, 0, 5),
+
 ('bx_posts_common', 'bulk', 'delete', '_bx_posts_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_posts_common', 'single', 'edit', '_bx_posts_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_posts_common', 'single', 'delete', '_bx_posts_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -247,6 +247,7 @@
     <string name="_bx_albums_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
     <string name="_bx_albums_grid_action_title_adm_more_actions"><![CDATA[Больше действий]]></string>
     <string name="_bx_albums_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
+    <string name="_bx_albums_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_albums_grid_action_err_delete"><![CDATA[Невозможно удалить выбранный(ные) альбом(ы).]]></string>
     <string name="_bx_albums_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
 

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

@@ -222,6 +222,7 @@
   <string name="_bx_classes_grid_action_title_adm_edit"><![CDATA[Редактирование]]></string>
   <string name="_bx_classes_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
   <string name="_bx_classes_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+  <string name="_bx_classes_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
   <string name="_bx_classes_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) класс(ы).]]></string>
   <string name="_bx_classes_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -211,6 +211,7 @@
     <string name="_bx_files_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
     <string name="_bx_files_grid_action_title_adm_more_actions"><![CDATA[Больше действий]]></string>
     <string name="_bx_files_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
+    <string name="_bx_files_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_files_grid_action_err_delete"><![CDATA[Ошибка удаления выбранных файлов]]></string>
     <string name="_bx_files_grid_txt_account_manager"><![CDATA[Перейти к управлению учетной записи]]></string>
 

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

@@ -317,6 +317,7 @@
     <string name="_bx_forum_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_forum_grid_action_title_add"><![CDATA[Новое сообщение]]></string>
     <string name="_bx_forum_grid_action_title_show_to"><![CDATA[Показать]]></string>
+    <string name="_bx_forum_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_forum_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) обсуждение(ния).]]></string>
     <string name="_bx_forum_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
     <string name="_bx_forum_grid_txt_manage_visibility"><![CDATA[Управление настройками видимости.]]></string>

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

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
 
-	<string name="_bx_glossary"><![CDATA[Глоссарий]]></string>
-	<string name="_bx_glossary_cmts"><![CDATA[Глоссарий - Комментарии]]></string>
-        <string name="_bx_glossary_reactions"><![CDATA[Глоссарий - Реакции]]></string>
+    <string name="_bx_glossary"><![CDATA[Глоссарий]]></string>
+    <string name="_bx_glossary_cmts"><![CDATA[Глоссарий - Комментарии]]></string>
+    <string name="_bx_glossary_reactions"><![CDATA[Глоссарий - Реакции]]></string>
 
-	<string name="_bx_glossary_option_summary_chars"><![CDATA[Количество символов в автогенерируемой сводке к термину]]></string>
-	<string name="_bx_glossary_option_plain_summary_chars"><![CDATA[Количество символов в описании Глоссарий при отсутствующей картинке Глоссарий]]></string>
+    <string name="_bx_glossary_option_enable_auto_approve"><![CDATA[Автоматически активировать термин после создания]]></string>
+    <string name="_bx_glossary_option_summary_chars"><![CDATA[Количество символов в автогенерируемой сводке к термину]]></string>
+    <string name="_bx_glossary_option_plain_summary_chars"><![CDATA[Количество символов в описании Глоссарий при отсутствующей картинке Глоссарий]]></string>
     <string name="_bx_glossary_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
     <string name="_bx_glossary_option_per_page_profile"><![CDATA[Количество элементов на странице профайла]]></string>
-	<string name="_bx_glossary_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
-	<string name="_bx_glossary_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
-	<string name="_bx_glossary_option_activate_terms_after_creation"><![CDATA[Активировать термин после создания]]></string>
-  <string name="_bx_glossary_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
+    <string name="_bx_glossary_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
+    <string name="_bx_glossary_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
+    <string name="_bx_glossary_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
 
 	<string name="_bx_glossary_form_entry"><![CDATA[Глоссарий]]></string>
 	<string name="_bx_glossary_form_entry_display_add"><![CDATA[Добавить термин]]></string>
@@ -210,6 +210,7 @@
     <string name="_bx_glossary_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
     <string name="_bx_glossary_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
     <string name="_bx_glossary_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
+    <string name="_bx_glossary_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_glossary_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) термин(ции).]]></string>
     <string name="_bx_glossary_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 
@@ -220,7 +221,7 @@
     <string name="_bx_glossary_search_extended_cmts"><![CDATA[Поиск комментариев к терминам]]></string>
 
     <string name="_bx_glossary_pre_lists_cats"><![CDATA[Категории терминов]]></string>
-	<string name="_bx_glossary_cat_Nouns"><![CDATA[Существительные]]></string>
+    <string name="_bx_glossary_cat_Nouns"><![CDATA[Существительные]]></string>
     <string name="_bx_glossary_cat_Pronouns"><![CDATA[Местоимения]]></string>
     <string name="_bx_glossary_cat_Verbs"><![CDATA[Глаголы]]></string>
     <string name="_bx_glossary_cat_Adverbs"><![CDATA[Наречия]]></string>
@@ -229,7 +230,7 @@
     <string name="_bx_glossary_cat_Prepositions"><![CDATA[Предлоги]]></string>
     <string name="_bx_glossary_cat_Infinitives"><![CDATA[Инфинитивы]]></string>
 	
-	<string name="_bx_glossary_pre_lists_statuses"><![CDATA[Статусы термина]]></string>
+    <string name="_bx_glossary_pre_lists_statuses"><![CDATA[Статусы термина]]></string>
     <string name="_bx_glossary_item_admin_status_active"><![CDATA[Активный]]></string>
     <string name="_bx_glossary_item_admin_status_hidden"><![CDATA[Скрытый]]></string>
     <string name="_bx_glossary_item_admin_status_pending"><![CDATA[Ожидающий]]></string>   
@@ -243,5 +244,7 @@
     <string name="_bx_glossary_txt_sample_reaction_single"><![CDATA[реакция '{0}' к термину]]></string>
     <string name="_bx_glossary_txt_sample_score_up_single"><![CDATA[голос за термин]]></string>
     <string name="_bx_glossary_txt_sample_score_down_single"><![CDATA[голос против термина]]></string>
-	<string name="_bx_glossary_txt_term_in_pending_status"><![CDATA[Этот термин ожидает одобрения.]]></string>
+        
+    <string name="_bx_glossary_txt_msg_status_hidden"><![CDATA[Данный термин был скрыт.]]></string>
+    <string name="_bx_glossary_txt_msg_status_pending"><![CDATA[Данный термин ожидает утверждения.]]></string>
 </resources>

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

@@ -5,6 +5,7 @@
 	<string name="_bx_market_cmts"><![CDATA[Рынок - Обзоры]]></string>
         <string name="_bx_market_reactions"><![CDATA[Рынок - Реакции]]></string>
 
+        <string name="_bx_market_option_enable_auto_approve"><![CDATA[Автоматически активировать продукт после создания]]></string>
 	<string name="_bx_market_option_enable_recurring"><![CDATA[Разрешить продажу подписок]]></string>
 	<string name="_bx_market_option_recurring_reserve"><![CDATA[Резерв (в днях) на принятие и обработку сообщения об оплате подписки.]]></string>
 	<string name="_bx_market_option_summary_chars"><![CDATA[Количество символов в автогенерируемой сводке к продуктам]]></string>
@@ -13,7 +14,7 @@
 	<string name="_bx_market_option_per_page_profile"><![CDATA[Количество элементов на странице профиля]]></string>
 	<string name="_bx_market_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
 	<string name="_bx_market_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
-  <string name="_bx_market_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
+        <string name="_bx_market_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
 
 	<string name="_bx_market_form_entry"><![CDATA[Продукт]]></string>
 	<string name="_bx_market_form_entry_display_add"><![CDATA[Добавление продукта]]></string>
@@ -330,10 +331,11 @@
     <string name="_bx_market_menu_item_title_products_licenses"><![CDATA[Мои лицензии]]></string>
 
 
-	<string name="_bx_market_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_market_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
-	<string name="_bx_market_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
-	<string name="_bx_market_grid_column_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
+    <string name="_bx_market_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_market_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_market_grid_column_title_adm_added"><![CDATA[Добавленные]]></string>
     <string name="_bx_market_grid_column_title_adm_author"><![CDATA[Автор]]></string>
@@ -342,6 +344,7 @@
     <string name="_bx_market_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
     <string name="_bx_market_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_market_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
+    <string name="_bx_market_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_market_grid_action_err_delete"><![CDATA[Невозможно удалить выбранный(ные) продукт(ы).]]></string>
     <string name="_bx_market_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
     
@@ -406,19 +409,21 @@
     <string name="_bx_market_cat_translations"><![CDATA[Переводы]]></string>
     <string name="_bx_market_cat_video"><![CDATA[Видео]]></string>
 
-	<string name="_bx_market_pre_lists_durations"><![CDATA[Продолжительность]]></string>
-	<string name="_bx_market_cat_duration_day"><![CDATA[ежедневно]]></string>
-	<string name="_bx_market_cat_duration_week"><![CDATA[еженедельно]]></string>
-	<string name="_bx_market_cat_duration_month"><![CDATA[ежемесячно]]></string>
-	<string name="_bx_market_cat_duration_year"><![CDATA[ежегодно]]></string>
+    <string name="_bx_market_pre_lists_durations"><![CDATA[Продолжительность]]></string>
+    <string name="_bx_market_cat_duration_day"><![CDATA[ежедневно]]></string>
+    <string name="_bx_market_cat_duration_week"><![CDATA[еженедельно]]></string>
+    <string name="_bx_market_cat_duration_month"><![CDATA[ежемесячно]]></string>
+    <string name="_bx_market_cat_duration_year"><![CDATA[ежегодно]]></string>
 
-	<string name="_bx_market_vote_counter"><![CDATA[{0} голосов]]></string>
+    <string name="_bx_market_vote_counter"><![CDATA[{0} голосов]]></string>
 
-	<string name="_bx_market_err_access_denied"><![CDATA[Доступ запрещен.]]></string>
-	<string name="_bx_market_err_no_payments"><![CDATA[Нет ни одного установленного модуля обработки платежей.]]></string>
-	<string name="_bx_market_err_not_accept_payments"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
-	<string name="_bx_market_err_not_accept_payments_single"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему, работающую с корзиной. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
-	<string name="_bx_market_err_not_accept_payments_recurring"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему, работающую с подписками. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
+    <string name="_bx_market_txt_msg_status_hidden"><![CDATA[Данный продукт был скрыт.]]></string>
+    <string name="_bx_market_txt_msg_status_pending"><![CDATA[Данный продукт ожидает утверждения.]]></string>
+    <string name="_bx_market_err_access_denied"><![CDATA[Доступ запрещен.]]></string>
+    <string name="_bx_market_err_no_payments"><![CDATA[Нет ни одного установленного модуля обработки платежей.]]></string>
+    <string name="_bx_market_err_not_accept_payments"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
+    <string name="_bx_market_err_not_accept_payments_single"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему, работающую с корзиной. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
+    <string name="_bx_market_err_not_accept_payments_recurring"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему, работающую с подписками. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
 
     <string name="_bx_market_txt_all_entries_by"><![CDATA[{0} продуктов]]></string>
     <string name="_bx_market_txt_all_entries_in"><![CDATA[<a href="{0}">Все продукты в {1} ({2})</a>]]></string>

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

@@ -5,6 +5,7 @@
     <string name="_bx_photos_cmts"><![CDATA[Фото - Комментарии]]></string>
     <string name="_bx_photos_reactions"><![CDATA[Фото - Реакции]]></string>
 
+    <string name="_bx_photos_option_enable_auto_approve"><![CDATA[Автоматически активировать фото после создания]]></string>
     <string name="_bx_photos_option_summary_chars"><![CDATA[Количество символов в автогенерируемой сводке к фото]]></string>
     <string name="_bx_photos_option_plain_summary_chars"><![CDATA[Количество символов в описании фото при отсутствующей картинке]]></string>
     <string name="_bx_photos_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
@@ -193,23 +194,24 @@
     <string name="_bx_photos_menu_item_title_view_entries_author"><![CDATA[Фото]]></string>
     <string name="_bx_photos_menu_item_title_system_view_entries_in_context"><![CDATA[Фото]]></string>
     <string name="_bx_photos_menu_item_title_view_entries_in_context"><![CDATA[Фото]]></string>
-  <string name="_bx_photos_menu_title_entries_my"><![CDATA[Мои фото - Меню действий]]></string>
+    <string name="_bx_photos_menu_title_entries_my"><![CDATA[Мои фото - Меню действий]]></string>
     <string name="_bx_photos_menu_set_title_entries_my"><![CDATA[Мои фото - Меню]]></string>
-	<string name="_bx_photos_menu_item_title_system_manage_my_photos"><![CDATA[Мои фото]]></string>
+    <string name="_bx_photos_menu_item_title_system_manage_my_photos"><![CDATA[Мои фото]]></string>
     <string name="_bx_photos_menu_item_title_manage_my_photos"><![CDATA[Фото]]></string>
     <string name="_bx_photos_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_photos_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_photos_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_photos_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
-	<string name="_bx_photos_menu_item_title_system_admt_photos"><![CDATA[Фото]]></string>
-	<string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Фото]]></string>
-	<string name="_bx_photos_menu_item_title_manage_my"><![CDATA[Мои фото]]></string>
-	<string name="_bx_photos_menu_item_title_manage_all"><![CDATA[Все фото]]></string>
+    <string name="_bx_photos_menu_item_title_system_admt_photos"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_menu_item_title_manage_my"><![CDATA[Мои фото]]></string>
+    <string name="_bx_photos_menu_item_title_manage_all"><![CDATA[Все фото]]></string>
 
-	<string name="_bx_photos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_photos_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
-	<string name="_bx_photos_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
-	<string name="_bx_photos_grid_column_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
+    <string name="_bx_photos_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_photos_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_photos_grid_column_title_adm_added"><![CDATA[Добавленные]]></string>
     <string name="_bx_photos_grid_column_title_adm_author"><![CDATA[Автор]]></string>
@@ -218,6 +220,7 @@
     <string name="_bx_photos_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
     <string name="_bx_photos_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_photos_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
+    <string name="_bx_photos_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_photos_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) фото.]]></string>
     <string name="_bx_photos_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 
@@ -257,4 +260,7 @@
     <string name="_bx_photos_txt_shutter_speed"><![CDATA[Выдержка]]></string>
     <string name="_bx_photos_txt_shutter_speed_value"><![CDATA[{0} сек]]></string>
     <string name="_bx_photos_txt_iso"><![CDATA[Чувствительность (ISO)]]></string>
+
+    <string name="_bx_photos_txt_msg_status_hidden"><![CDATA[Данное фото было скрыто.]]></string>
+    <string name="_bx_photos_txt_msg_status_pending"><![CDATA[Данное фото ожидает утверждения.]]></string>
 </resources>

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

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
 
-	<string name="_bx_polls"><![CDATA[Голосования]]></string>
-	<string name="_bx_polls_cmts"><![CDATA[Голосования - Комментарии]]></string>
+        <string name="_bx_polls"><![CDATA[Голосования]]></string>
+        <string name="_bx_polls_cmts"><![CDATA[Голосования - Комментарии]]></string>
         <string name="_bx_polls_reactions"><![CDATA[Голосования - Реакции]]></string>
 
-	<string name="_bx_polls_option_title_chars"><![CDATA[Количество символов в автогенерируемом заголовке голосования]]></string>
-	<string name="_bx_polls_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
-	<string name="_bx_polls_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
-	<string name="_bx_polls_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
-  <string name="_bx_polls_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
+        <string name="_bx_polls_option_enable_auto_approve"><![CDATA[Автоматически активировать голосование после создания]]></string>
+        <string name="_bx_polls_option_title_chars"><![CDATA[Количество символов в автогенерируемом заголовке голосования]]></string>
+        <string name="_bx_polls_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
+        <string name="_bx_polls_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
+        <string name="_bx_polls_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
+        <string name="_bx_polls_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
 
 	<string name="_bx_polls_form_entry"><![CDATA[Голосования]]></string>
 	<string name="_bx_polls_form_entry_display_add"><![CDATA[Добавить голосование]]></string>
@@ -190,17 +191,18 @@
     <string name="_bx_polls_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_polls_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_polls_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
-	<string name="_bx_polls_menu_item_title_system_admt_polls"><![CDATA[Голосования]]></string>
-	<string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Голосования]]></string>
-	<string name="_bx_polls_menu_item_title_manage_my"><![CDATA[Мои голосования]]></string>
-	<string name="_bx_polls_menu_item_title_manage_all"><![CDATA[Все голосования]]></string>
-	<string name="_bx_polls_menu_item_view_subentries"><![CDATA[Показать голосование]]></string>
+    <string name="_bx_polls_menu_item_title_system_admt_polls"><![CDATA[Голосования]]></string>
+    <string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Голосования]]></string>
+    <string name="_bx_polls_menu_item_title_manage_my"><![CDATA[Мои голосования]]></string>
+    <string name="_bx_polls_menu_item_title_manage_all"><![CDATA[Все голосования]]></string>
+    <string name="_bx_polls_menu_item_view_subentries"><![CDATA[Показать голосование]]></string>
     <string name="_bx_polls_menu_item_view_results"><![CDATA[Показать результаты]]></string>
 
-	<string name="_bx_polls_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_polls_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
-	<string name="_bx_polls_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
-	<string name="_bx_polls_grid_column_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
+    <string name="_bx_polls_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_polls_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_polls_grid_column_title_adm_added"><![CDATA[Добавленные]]></string>
     <string name="_bx_polls_grid_column_title_adm_author"><![CDATA[Автор]]></string>
@@ -209,6 +211,7 @@
     <string name="_bx_polls_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
     <string name="_bx_polls_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_polls_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
+    <string name="_bx_polls_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_polls_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) голосование(ния).]]></string>
     <string name="_bx_polls_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 
@@ -253,4 +256,7 @@
     <string name="_bx_polls_txt_subentry_vote_counter"><![CDATA[{0} голосов]]></string>
     <string name="_bx_polls_txt_subentry_vote_percent"><![CDATA[({0}%)]]></string>
     <string name="_bx_polls_msg_public_voting"><![CDATA[Это публичное голосование, ваш выбор будет виден другим.]]></string>
+
+    <string name="_bx_polls_txt_msg_status_hidden"><![CDATA[Данное голосование было скрыто.]]></string>
+    <string name="_bx_polls_txt_msg_status_pending"><![CDATA[Данное голосование ожидает утверждения.]]></string>
 </resources>

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

@@ -264,6 +264,7 @@
     <string name="_bx_posts_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
     <string name="_bx_posts_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_posts_grid_action_title_adm_clear_reports"><![CDATA[Очистить жалобы]]></string>
+    <string name="_bx_posts_grid_column_title_adm_status_admin"><![CDATA[Модерация]]></string>
     <string name="_bx_posts_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) публикацию(ции).]]></string>
     <string name="_bx_posts_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>