View GitHub Repository silverstripe-section-io

Schedule Inspection
Subscribe
Completed
Push — master ( a743e8...453823 )
by Florian
01:45
created
Status
Category
Toggle Patches
code/SectionIO.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -46,9 +46,9 @@  discard block
 
 block discarded – undo
46 46 
     {
47 47 
         $image = Image::get()->byID($imageID);
48 48 
         if ($image && $image->exists()) {
49 
-            $exp = 'obj.http.x-url ~ "^/'.preg_quote($image->getFilename()).'$"'; // image itself
50 
-            $exp    .= ' || obj.http.x-url ~ "^/'.preg_quote($image->Parent()->getFilename())
51 
-                    .'_resampled/(.*)\-'.preg_quote($image->Name).'$"'; // resampled versions
49 
+            $exp = 'obj.http.x-url ~ "^/' . preg_quote($image->getFilename()) . '$"'; // image itself
50 
+            $exp .= ' || obj.http.x-url ~ "^/' . preg_quote($image->Parent()->getFilename())
51 
+                    .'_resampled/(.*)\-' . preg_quote($image->Name) . '$"'; // resampled versions
52 52 
             return static::performFlush($exp);
53 53 
         }
54 54 
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
     {
60 60 
         $file = File::get()->byID($fileID);
61 61 
         if ($file && $file->exists()) {
62 
-            $exp = 'obj.http.x-url ~ "^/'.preg_quote($file->getFilename()).'$"';
62 
+            $exp = 'obj.http.x-url ~ "^/' . preg_quote($file->getFilename()) . '$"';
63 63 
             return static::performFlush($exp);
64 64 
         }
65 65 
 
@@ -79,23 +79,23 @@  discard block
 
 block discarded – undo
79 79 
             switch ($strategy) {
80 80
81 81 
                 case SectionIO::SITETREE_STRATEGY_SINGLE:
82 
-                    $exp = 'obj.http.content-type ~ "'.preg_quote('text/html').'"';
83 
-                    $exp .= ' && obj.http.x-url ~ "^'.preg_quote($sitetree->Link()).'$"';
82 
+                    $exp = 'obj.http.content-type ~ "' . preg_quote('text/html') . '"';
83 
+                    $exp .= ' && obj.http.x-url ~ "^' . preg_quote($sitetree->Link()) . '$"';
84 84 
                     break;
85 85
86 86 
                 case SectionIO::SITETREE_STRATEGY_PARENTS:
87 
-                    $exp = 'obj.http.content-type ~ "'.preg_quote('text/html').'"';
88 
-                    $exp .= ' && (obj.http.x-url ~ "^'.preg_quote($sitetree->Link()).'$"';
87 
+                    $exp = 'obj.http.content-type ~ "' . preg_quote('text/html') . '"';
88 
+                    $exp .= ' && (obj.http.x-url ~ "^' . preg_quote($sitetree->Link()) . '$"';
89 89 
                     $parent = $sitetree->getParent();
90 90 
                     while ($parent && $parent->exists()) {
91 
-                        $exp .= ' || obj.http.x-url ~ "^'.preg_quote($parent->Link()).'$"';
91 
+                        $exp .= ' || obj.http.x-url ~ "^' . preg_quote($parent->Link()) . '$"';
92 92 
                         $parent = $parent->getParent();
93 93 
                     }
94 94 
                     $exp .= ')';
95 95 
                     break;
96 96
97 97 
                 case SectionIO::SITETREE_STRATEGY_ALL:
98 
-                    $exp = 'obj.http.content-type ~ "'.preg_quote('text/html').'"';
98 
+                    $exp = 'obj.http.content-type ~ "' . preg_quote('text/html') . '"';
99 99 
                     break;
100 100
101 101 
                 case 'everyting': // compatibility, old typo
 
@@ -114,7 +114,7 @@  discard block
 
 block discarded – undo
114 114
115 115 
     public static function flushURL($url) {
116 116 
         if ($url) {
117 
-            $exp = 'obj.http.x-url ~ "^'.preg_quote($url).'$"';
117 
+            $exp = 'obj.http.x-url ~ "^' . preg_quote($url) . '$"';
118 118 
             return static::performFlush($exp);
119 119 
         }
120 120 
         return false;
 
@@ -142,10 +142,10 @@  discard block
 
 block discarded – undo
142 142 
 					$conn = $service->request(null, 'POST', null, $headers, $options);
143 143
144 144 
 					if ($conn->isError()) {
145 
-						SS_Log::log('SectionIO::performFlush :: '.$conn->getStatusCode().' : '.$conn->getStatusDescription().' : '.$url, SS_Log::ERR);
145 
+						SS_Log::log('SectionIO::performFlush :: ' . $conn->getStatusCode() . ' : ' . $conn->getStatusDescription() . ' : ' . $url, SS_Log::ERR);
146 146 
 						$success = $success && false;
147 147 
 					} else {
148 
-						SS_Log::log('SectionIO::performFlush :: ban successful. url: '.$url."; ban expression: '".$banExpression."'", SS_Log::NOTICE);
148 
+						SS_Log::log('SectionIO::performFlush :: ban successful. url: ' . $url . "; ban expression: '" . $banExpression . "'", SS_Log::NOTICE);
149 149 
 					}
150 150 
 				}
151 151 
 			} else {
Please login to merge, or discard this patch.