Alex Trofimov 6 rokov pred
rodič
commit
4d203db1b4

+ 1 - 1
inc/classes/BxDolPush.php

@@ -163,7 +163,7 @@ class BxDolPush extends BxDolFactory implements iBxDolSingleton
         $oResult = @json_decode($sResult, true);
         if(isset($oResult['errors'])){
             foreach($oResult['errors'] as $sError) {  
-                file_put_contents(BX_DIRECTORY_PATH_LOGS . '/bx_push.log', date('m-d-Y H:i:s') . ": " . "Error:" . $sError . " Message:" . json_encode($aMessage) . "\n", FILE_APPEND);            
+                bx_log('sys_push', $sError . " Message:" . json_encode($aMessage));
             }
         }
 

+ 1 - 3
inc/classes/BxDolTwilio.php

@@ -70,9 +70,7 @@ class BxDolTwilio extends BxDolFactory implements iBxDolSingleton
     
     private function writeLog($sString)
 	{
-		$sFile = BX_DIRECTORY_PATH_LOGS . '/bx_twilio.log';   
-		file_put_contents($sFile, date('m-d-Y H:i:s').": ", FILE_APPEND);            
-		file_put_contents($sFile, $sString."\n", FILE_APPEND);
+        bx_log('sys_twilio', $sString);
 	}
 }
 

+ 2 - 9
inc/utils.inc.php

@@ -547,16 +547,9 @@ function echoDbg( $what, $desc = '' )
     echo "</pre>\n";
 }
 
-function echoDbgLog($mWhat, $sDesc = '', $sFileName = 'debug.log')
+function echoDbgLog($mWhat, $sDesc = 'unused', $sFileName = 'unused')
 {
-    $sCont =
-        '--- ' . date('r') . ' (' . BX_DOL_START . ") ---\n" .
-        $sDesc . "\n" .
-        print_r($mWhat, true) . "\n\n\n";
-
-    $rFile = fopen(BX_DIRECTORY_PATH_LOGS . $sFileName, 'a');
-    fwrite($rFile, $sCont);
-    fclose($rFile);
+    bx_log('sys_debug', $mWhat);
 }
 
 function dbgTiming($sStartMicrotime)

+ 3 - 1
install/sql/system.sql

@@ -5171,7 +5171,9 @@ CREATE TABLE `sys_objects_logs` (
 );
 
 INSERT INTO `sys_objects_logs` (`object`, `module`, `logs_storage`, `title`, `active`, `class_name`, `class_file`) VALUES
-('sys_db_err', 'system', 'Auto', '_sys_log_db_err', 1, '', '');
+('sys_debug', 'system', 'Auto', '_sys_log_debug', 1, '', ''),
+('sys_twilio', 'system', 'Auto', '_sys_log_twilio', 1, '', ''),
+('sys_push', 'system', 'Auto', '_sys_log_push', 1, '', '');
 
 
 -- --------------------------------------------------------

+ 3 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -2503,7 +2503,9 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_location_determining"><![CDATA[Determining location...]]></string>
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Geolocation is not supported by this browser]]></string>
 	<string name="_sys_location_undefined"><![CDATA[Location off]]></string>
-	<string name="_sys_log_db_err"><![CDATA[System: DB error log]]></string>
+	<string name="_sys_log_debug"><![CDATA[System: debug]]></string>
+    <string name="_sys_log_twilio"><![CDATA[System: Twilio]]></string>
+    <string name="_sys_log_push"><![CDATA[System: PUSH]]></string>
     <string name="_sys_macros_malformed"><![CDATA[Error: malformed macros]]></string>
     <string name="_sys_macros_unsafe"><![CDATA[Error: unsafe macros]]></string>
     <string name="_sys_macros_output_not_displayable"><![CDATA[Error: output isn't displayable]]></string>

+ 3 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -2460,7 +2460,9 @@
 	<string name="_sys_location_determining"><![CDATA[Определение местоположения...]]></string>
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Геолокация не поддерживается этим браузером]]></string>
 	<string name="_sys_location_undefined"><![CDATA[Отключить местоположение]]></string>
-    <string name="_sys_log_db_err"><![CDATA[Система: логирование ошибок БД]]></string>
+	<string name="_sys_log_debug"><![CDATA[Система: отладка]]></string>
+    <string name="_sys_log_twilio"><![CDATA[Система: Twilio]]></string>
+    <string name="_sys_log_push"><![CDATA[Система: PUSH]]></string>
     <string name="_sys_macros_malformed"><![CDATA[Ошибка: некорректный макрос]]></string>
     <string name="_sys_macros_unsafe"><![CDATA[Ошибка: небезопасный макрос]]></string>
     <string name="_sys_macros_output_not_displayable"><![CDATA[Ошибка: некорректный вывод макроса]]></string>

+ 0 - 2
plugins/htmlpurifier/standalone/HTMLPurifier/Filter/LocalIframe.php

@@ -16,12 +16,10 @@ class HTMLPurifier_Filter_LocalIframe extends HTMLPurifier_Filter
                     $iHeight = $height[1];
                     $sDolUrl = preg_quote(BX_DOL_URL_ROOT);
                     $sIframeUrl = '';
-echoDbgLog($sItem);
                     if (preg_match("#({$sDolUrl}[a-zA-Z0-9_=\-\?\&\/]+)#", $sItem, $aMatches))
                         $sIframeUrl = $aMatches[1];
                     if (preg_match("#src=\"(((?!//)(?![a-z]+://)(?![a-z]+://))[a-zA-Z0-9_=\-\?\&\/]+)#", $sItem, $aMatches))
                         $sIframeUrl = $aMatches[1];
-echoDbgLog($sIframeUrl);
                     if ($sIframeUrl)
                         $sHtml = str_replace($aResult[0][$key], '<img class="LocalIframe" width="' . $iWidth . '" height="' . $iHeight . '" src="' . $sIframeUrl . '">', $sHtml);                    
                 }