X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=ConvertStyle.php;h=4f52e1016cee579761774899efbaa04e21ed42c7;hp=4f57f23693fbea3bc1112de69522081a45d996d7;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=fe96e2eaa564cdb9bdfa877697570641772e6e79

diff --git a/ConvertStyle.php b/ConvertStyle.php
index 4f57f236..4f52e101 100644
--- a/ConvertStyle.php
+++ b/ConvertStyle.php
@@ -52,10 +52,10 @@ class Pman_Core_ConvertStyle extends Pman
     
     function checkHeader($url)
     {
-        if(strpos($url, 'https') !== false)
-        {
-            $this->jerr('accept HTTP url only!');
-        }
+        // if(strpos($url, 'https') !== false)
+        // {
+        //     $this->jerr('accept HTTP url only!');
+        // }
         $headers = get_headers($url, 1);
         if(strpos(is_array($headers['Content-Type']) ? $headers['Content-Type'][0] : $headers['Content-Type'], 'text/html') === false)
         {
@@ -92,7 +92,7 @@ class Pman_Core_ConvertStyle extends Pman
             $data = file_get_contents($file);
         }
         
-        if(preg_match('/NOT CONVERT STYLE/', $data)){
+        if(preg_match('/^\s*<!--\s*NOT CONVERT STYLE\s*-->\s*/', $data)){
             $inLineCss = false;
         }