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

inc/classes/BxDolCategoryQuery.php

@@ -48,10 +48,20 @@ class BxDolCategoryQuery extends BxDolDb
         $oDb = BxDolDb::getInstance();
         $sWhere = '';
         // TODO: in the future add 'module' field to categories object
-        if ($bPublicOnly && ($oModule = BxDolModule::getInstance($aObject['search_object'])) && isset($oModule->_oConfig->CNF['FIELD_ALLOW_VIEW_TO'])) {
-            bx_import('BxDolPrivacy');
-            $a = isLogged() ? array(BX_DOL_PG_ALL, BX_DOL_PG_MEMBERS) : array(BX_DOL_PG_ALL);
-            $sWhere = ' AND `' . $aObject['table'] . '`.`' . $oModule->_oConfig->CNF['FIELD_ALLOW_VIEW_TO'] . '` IN(' . $oDb->implode_escape($a) . ') ';
+        if ($bPublicOnly && ($oModule = BxDolModule::getInstance($aObject['search_object'])) && isset($oModule->_oConfig->CNF)) {
+            $CNF = &$oModule->_oConfig->CNF;
+
+            if(isset($CNF['FIELD_ALLOW_VIEW_TO'])) {
+                bx_import('BxDolPrivacy');
+                $a = isLogged() ? array(BX_DOL_PG_ALL, BX_DOL_PG_MEMBERS) : array(BX_DOL_PG_ALL);
+                $sWhere .= ' AND `' . $aObject['table'] . '`.`' . $CNF['FIELD_ALLOW_VIEW_TO'] . '` IN(' . $oDb->implode_escape($a) . ') ';
+            }
+
+            if(isset($CNF['FIELD_STATUS']))
+                $sWhere .= ' AND `' . $aObject['table'] . '`.`' . $CNF['FIELD_STATUS'] . '` = \'active\' ';
+
+            if(isset($CNF['FIELD_STATUS_ADMIN']))
+                $sWhere .= ' AND `' . $aObject['table'] . '`.`' . $CNF['FIELD_STATUS_ADMIN'] . '` = \'active\' ';
         }
         return $oDb->getOne("SELECT COUNT(*) FROM `" . $aObject['table'] . "` " . $aObject['join'] . " WHERE `" . $aObject['field'] . "` = :cat " . $aObject['where'] . $sWhere, array('cat' => $sCategoryValue));
     }

install/sql/system.sql

@@ -3296,7 +3296,7 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('sys_comment_edit', 'cmt_id', 2147483647, 1, 4),
 ('sys_comment_edit', 'cmt_parent_id', 2147483647, 1, 5),
 ('sys_comment_edit', 'cmt_text', 2147483647, 1, 6),
-('sys_comment_edit', 'cmt_image', 2147483647, 0, 7),
+('sys_comment_edit', 'cmt_image', 2147483647, 1, 7),
 ('sys_comment_edit', 'cmt_submit', 2147483647, 1, 8),
 
 ('sys_review_post', 'sys', 2147483647, 1, 1),
@@ -3316,7 +3316,7 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('sys_review_edit', 'cmt_parent_id', 2147483647, 1, 5),
 ('sys_review_edit', 'cmt_text', 2147483647, 1, 6),
 ('sys_review_edit', 'cmt_mood', 2147483647, 1, 7),
-('sys_review_edit', 'cmt_image', 2147483647, 0, 8),
+('sys_review_edit', 'cmt_image', 2147483647, 1, 8),
 ('sys_review_edit', 'cmt_submit', 2147483647, 1, 9),
 
 ('sys_report_post', 'sys', 2147483647, 1, 1),

modules/boonex/files/template/css/main.css

@@ -20,10 +20,9 @@
 }
 
 .bx-files-text-unit .bx-base-text-unit-text .sys-icon {
-    position:absolute;
-    top:0;
-    left:0;
-    font-size:3.2rem;
+    position: absolute;
+    line-height: normal;
+    font-size: 3.2rem;
 }
 
 .bx-files-text-unit .bx-base-text-unit-text h2,

modules/boonex/files/template/unit.html

@@ -5,7 +5,7 @@
 		</div>
 	</bx_if:thumb>
 	<div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
-        <i class="sys-icon __icon__ bx-def-padding"></i>
+            <i class="sys-icon __icon__"></i>
 	    <h2><a href="__content_url__">__title__</a></h2>
 	    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
             <bx_if:meta><div class="bx-base-general-unit-meta">__meta__</div></bx_if:meta>

template/css/vote.css

@@ -269,6 +269,8 @@ div.bx-vote-by-list div.bx-base-pofile-unit {
     position: relative;
     display: -webkit-flex;
     display: flex;
+    -webkit-justify-content: space-between;
+    justify-content: space-between;
     -webkit-align-items: center;
     align-items: center;
 }
@@ -279,6 +281,11 @@ div.bx-vote-by-list div.bx-base-pofile-unit {
     padding-bottom: 0;
 }
 
+.bx-vote-bls-content .bx-vote-by-item:before,
+.bx-vote-bls-content .bx-vote-by-item:after {
+    display: none;
+}
+
 
 /*----------------------------------*/
 /*--- Stars based Element Styles ---*/