@@ -333,47 +333,47 @@ |
||
333 | 333 | } |
334 | 334 | } |
335 | 335 | |
336 | - /** |
|
337 | - * @param string $string |
|
338 | - */ |
|
339 | - protected function AnalyseImgUrlString($string) |
|
340 | - { |
|
341 | - $string = (string) $string; |
|
342 | - $start = '[IMG-REPLACE]'; |
|
343 | - $end = '[/IMG-REPLACE]'; |
|
344 | - $valid = false; |
|
345 | - |
|
346 | - if ($string != str_replace($start, '', $string) && $string == str_replace($start.$end, '', $string)) { |
|
347 | - $string = ' '.$string; |
|
348 | - $ini = strpos($string, $start); |
|
349 | - if ($ini == 0) { |
|
350 | - $url = ''; |
|
351 | - $rest = $string; |
|
352 | - } else { |
|
353 | - $ini += strlen($start); |
|
354 | - $len = ((strpos($string, $end, $ini)) - $ini); |
|
355 | - $url = substr($string, $ini, $len); |
|
356 | - |
|
357 | - $ini = strpos($string, $start); |
|
358 | - $len = strpos($string, $end, $ini + strlen($start)) + strlen($end); |
|
359 | - $rest = substr($string, 0, $ini).substr($string, $len); |
|
360 | - } |
|
361 | - |
|
362 | - //TODO: create a better url validity check |
|
363 | - if(! trim(str_replace(['http:', ' '], '', $url)) || $url == str_replace('http:', '', $url)) { |
|
364 | - $valid = false; |
|
365 | - } |
|
366 | - } else { |
|
367 | - $url = ''; |
|
368 | - $rest = str_replace([$start, $end], '', $string); |
|
369 | - } |
|
370 | - |
|
371 | - return [ |
|
372 | - 'url' => trim($url), |
|
373 | - 'rest' => trim($rest), |
|
374 | - 'valid_url' => $valid, |
|
375 | - ]; |
|
376 | - } |
|
336 | + /** |
|
337 | + * @param string $string |
|
338 | + */ |
|
339 | + protected function AnalyseImgUrlString($string) |
|
340 | + { |
|
341 | + $string = (string) $string; |
|
342 | + $start = '[IMG-REPLACE]'; |
|
343 | + $end = '[/IMG-REPLACE]'; |
|
344 | + $valid = false; |
|
345 | + |
|
346 | + if ($string != str_replace($start, '', $string) && $string == str_replace($start.$end, '', $string)) { |
|
347 | + $string = ' '.$string; |
|
348 | + $ini = strpos($string, $start); |
|
349 | + if ($ini == 0) { |
|
350 | + $url = ''; |
|
351 | + $rest = $string; |
|
352 | + } else { |
|
353 | + $ini += strlen($start); |
|
354 | + $len = ((strpos($string, $end, $ini)) - $ini); |
|
355 | + $url = substr($string, $ini, $len); |
|
356 | + |
|
357 | + $ini = strpos($string, $start); |
|
358 | + $len = strpos($string, $end, $ini + strlen($start)) + strlen($end); |
|
359 | + $rest = substr($string, 0, $ini).substr($string, $len); |
|
360 | + } |
|
361 | + |
|
362 | + //TODO: create a better url validity check |
|
363 | + if(! trim(str_replace(['http:', ' '], '', $url)) || $url == str_replace('http:', '', $url)) { |
|
364 | + $valid = false; |
|
365 | + } |
|
366 | + } else { |
|
367 | + $url = ''; |
|
368 | + $rest = str_replace([$start, $end], '', $string); |
|
369 | + } |
|
370 | + |
|
371 | + return [ |
|
372 | + 'url' => trim($url), |
|
373 | + 'rest' => trim($rest), |
|
374 | + 'valid_url' => $valid, |
|
375 | + ]; |
|
376 | + } |
|
377 | 377 | |
378 | 378 | public function SaveAsPdf() |
379 | 379 | { |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | { |
168 | 168 | $ct_file = $this->ReadOpenXmlFile('[Content_Types].xml', 'object'); |
169 | 169 | |
170 | - if (! ($ct_file instanceof \Traversable)) { |
|
170 | + if (!($ct_file instanceof \Traversable)) { |
|
171 | 171 | throw new Exception('Cannot traverse through [Content_Types].xml.'); |
172 | 172 | } |
173 | 173 | |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | |
184 | 184 | //if content type for jpg has not been set, add it to xml |
185 | 185 | // and save xml to file and add it to the archive |
186 | - if (! $ct_already_set) { |
|
186 | + if (!$ct_already_set) { |
|
187 | 187 | $sxe = $ct_file->addChild('Default'); |
188 | 188 | $sxe->addAttribute('Extension', $imageCt); |
189 | 189 | $sxe->addAttribute('ContentType', 'image/'.$imageCt); |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | } |
361 | 361 | |
362 | 362 | //TODO: create a better url validity check |
363 | - if(! trim(str_replace(['http:', ' '], '', $url)) || $url == str_replace('http:', '', $url)) { |
|
363 | + if (!trim(str_replace(['http:', ' '], '', $url)) || $url == str_replace('http:', '', $url)) { |
|
364 | 364 | $valid = false; |
365 | 365 | } |
366 | 366 | } else { |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | //wait until process is ready |
387 | 387 | } |
388 | 388 | // executes after the command finishes |
389 | - if (! $process->isSuccessful()) { |
|
389 | + if (!$process->isSuccessful()) { |
|
390 | 390 | throw new \Symfony\Component\Process\Exception\ProcessFailedException($process); |
391 | 391 | } else { |
392 | 392 | $path_parts = pathinfo($this->StoragePath($this->local_path.$this->template_file_name)); |