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

inc/classes/BxDolLogs.php

@@ -71,8 +71,15 @@ class BxDolLogs extends BxDolFactory implements iBxDolFactoryObject
             return $GLOBALS['bxDolClasses']['BxDolLogs!' . $sObject];
 
         $aObject = BxDolLogsQuery::getLogsObject($sObject);
-        if(!$aObject || !is_array($aObject) || !$aObject['active'])
+        if($aObject && is_array($aObject) && !$aObject['active'])
             return false;
+        if(!$aObject) {
+            $aObject = array(
+                'object' => $sObject,
+                'module' => 'system',
+                'logs_storage' => getParam('sys_logs_storage_default'),
+            );
+        }
 
         $sClass = 'BxDolLogs';
         if(!empty($aObject['class_name'])) {

inc/classes/BxDolLogsStorageFolder.php

@@ -52,7 +52,11 @@ class BxDolLogsStorageFolder extends BxDolFactory implements iBxDolSingleton
 
         $s = $this->formatLogString($oObject, $mixed);
 
-        return file_put_contents($sFile, $s, FILE_APPEND) ? true : false;
+        $bNewFile = !file_exists($sFile);
+        $bRet = file_put_contents($sFile, $s, FILE_APPEND) ? true : false;
+        if ($bNewFile && $bRet)
+            chmod($sFile, BX_DOL_FILE_RIGHTS);
+        return $bRet;
     }
 
     protected function formatLogString($oObject, $mixed, $bIncludeObjectName = false)

inc/classes/BxDolTemplate.php

@@ -2094,7 +2094,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         		 * Is mainly needed for CSS files which are gotten from LESS compiler.
         		 */
         		$sContent = preg_replace_callback(
-	                "'@import\s+[\'|\"]*\s*" . str_replace("/", "\/", BX_DOL_URL_ROOT) . "([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*;'", function ($aMatches)  use($oTemplate, $sPath, $aIncluded) {
+	                "'@import\s+[\'|\"]*\s*" . str_replace("/", "\/", BX_DOL_URL_ROOT) . "([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*;'", function ($aMatches)  use($oTemplate, $sPath, &$aIncluded) {
 	                	return $oTemplate->_compileCss(realpath(BX_DIRECTORY_PATH_ROOT . $aMatches[1]), $aIncluded);
 	                }, $sContent);
 
@@ -2103,7 +2103,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
 				 * Is mainly needed for default CSS files.
 				 */
 	            $sContent = preg_replace_callback(
-	                "'@import\s+url\s*\(\s*[\'|\"]*\s*([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*\)\s*;'", function ($aMatches)  use($oTemplate, $sPath, $aIncluded) {
+	                "'@import\s+url\s*\(\s*[\'|\"]*\s*([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*\)\s*;'", function ($aMatches)  use($oTemplate, $sPath, &$aIncluded) {
 	                	return $oTemplate->_compileCss(realpath($sPath . dirname($aMatches[1])) . DIRECTORY_SEPARATOR . basename($aMatches[1]), $aIncluded);
 	                }, $sContent);
 

modules/boonex/reviews/install/sql/disable.sql

@@ -23,7 +23,7 @@ DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matr
 DELETE FROM `sys_acl_actions` WHERE `Module` = 'bx_reviews';
 
 -- SEARCH
-DELETE FROM `sys_objects_search` WHERE `ObjectName` IN ('bx_reviews', 'bx_reviews_cmts');
+DELETE FROM `sys_objects_search` WHERE `ObjectName` IN ('bx_reviews', 'bx_reviews_products', 'bx_reviews_cmts');
 
 -- METATAGS
 DELETE FROM `sys_objects_metatags` WHERE `object` = 'bx_reviews';