@@ -14,6 +14,9 @@ discard block |
||
14 | 14 | ]; |
15 | 15 | } |
16 | 16 | |
17 | + /** |
|
18 | + * @param string $manipulation |
|
19 | + */ |
|
17 | 20 | public function GetImageFromUrl($url, $manipulation) |
18 | 21 | { |
19 | 22 | $allowed_imgs = $this->AllowedContentTypeImages(); |
@@ -37,6 +40,10 @@ discard block |
||
37 | 40 | return false; |
38 | 41 | } |
39 | 42 | |
43 | + /** |
|
44 | + * @param DocxMustache $parent |
|
45 | + * @param string $data |
|
46 | + */ |
|
40 | 47 | public function ResampleImage($parent, $imgs, $k, $data) |
41 | 48 | { |
42 | 49 | \Storage::disk($parent->storageDisk)->put($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'], $data); |
@@ -62,7 +62,7 @@ |
||
62 | 62 | |
63 | 63 | $h = null; |
64 | 64 | |
65 | - $img_rework->resize($w, $h, function ($constraint) { |
|
65 | + $img_rework->resize($w, $h, function($constraint) { |
|
66 | 66 | $constraint->aspectRatio(); |
67 | 67 | $constraint->upsize(); |
68 | 68 | }); |
@@ -101,6 +101,9 @@ discard block |
||
101 | 101 | ->extractTo($this->StoragePath($this->local_path), [$file], \Chumper\Zipper\Zipper::WHITELIST); |
102 | 102 | } |
103 | 103 | |
104 | + /** |
|
105 | + * @param string $file |
|
106 | + */ |
|
104 | 107 | protected function ReadOpenXmlFile($file, $type = 'file') |
105 | 108 | { |
106 | 109 | $this->exctractOpenXmlFile($file); |
@@ -134,6 +137,10 @@ discard block |
||
134 | 137 | } |
135 | 138 | } |
136 | 139 | |
140 | + /** |
|
141 | + * @param string $file |
|
142 | + * @param false|string $folder |
|
143 | + */ |
|
137 | 144 | protected function SaveOpenXmlObjectToFile($xmlObject, $file, $folder) |
138 | 145 | { |
139 | 146 | if ($xmlString = $xmlObject->asXML()) { |
@@ -191,6 +198,9 @@ discard block |
||
191 | 198 | } |
192 | 199 | } |
193 | 200 | |
201 | + /** |
|
202 | + * @param \SimpleXMLElement $main_file |
|
203 | + */ |
|
194 | 204 | protected function FetchReplaceableImages(&$main_file, $ns) |
195 | 205 | { |
196 | 206 | //set up basic arrays to keep track of imgs |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | { |
167 | 167 | $ct_file = $this->ReadOpenXmlFile('[Content_Types].xml', 'object'); |
168 | 168 | |
169 | - if (! ($ct_file instanceof \Traversable)) { |
|
169 | + if (!($ct_file instanceof \Traversable)) { |
|
170 | 170 | throw new Exception('Cannot traverse through [Content_Types].xml.'); |
171 | 171 | } |
172 | 172 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | //if content type for jpg has not been set, add it to xml |
184 | 184 | // and save xml to file and add it to the archive |
185 | - if (! $ct_already_set) { |
|
185 | + if (!$ct_already_set) { |
|
186 | 186 | $sxe = $ct_file->addChild('Default'); |
187 | 187 | $sxe->addAttribute('Extension', $imageCt); |
188 | 188 | $sxe->addAttribute('ContentType', 'image/'.$imageCt); |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | $valid = true; |
372 | 372 | |
373 | 373 | //TODO: create a better url validity check |
374 | - if (! trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
374 | + if (!trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
375 | 375 | $valid = false; |
376 | 376 | } |
377 | 377 | $mode = 'url'; |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | $valid = true; |
395 | 395 | |
396 | 396 | //check if path starts with storage path |
397 | - if (! starts_with($path, storage_path())) { |
|
397 | + if (!starts_with($path, storage_path())) { |
|
398 | 398 | $valid = false; |
399 | 399 | } |
400 | 400 | $mode = 'path'; |
@@ -418,14 +418,14 @@ discard block |
||
418 | 418 | { |
419 | 419 | $this->Log('Converting DOCX to PDF'); |
420 | 420 | //convert to pdf with libre office |
421 | - $command = 'soffice --headless --convert-to pdf '.str_replace(" ","\ ",$this->StoragePath($this->local_path.$this->template_file_name)).' --outdir '.$this->StoragePath($this->local_path); |
|
421 | + $command = 'soffice --headless --convert-to pdf '.str_replace(" ", "\ ", $this->StoragePath($this->local_path.$this->template_file_name)).' --outdir '.$this->StoragePath($this->local_path); |
|
422 | 422 | $process = new \Symfony\Component\Process\Process($command); |
423 | 423 | $process->start(); |
424 | 424 | while ($process->isRunning()) { |
425 | 425 | //wait until process is ready |
426 | 426 | } |
427 | 427 | // executes after the command finishes |
428 | - if (! $process->isSuccessful()) { |
|
428 | + if (!$process->isSuccessful()) { |
|
429 | 429 | throw new \Symfony\Component\Process\Exception\ProcessFailedException($process); |
430 | 430 | } else { |
431 | 431 | $path_parts = pathinfo($this->StoragePath($this->local_path.$this->template_file_name)); |
@@ -10,9 +10,9 @@ discard block |
||
10 | 10 | $mustache_template = self::TagCleaner($mustache_template); |
11 | 11 | } |
12 | 12 | |
13 | - $m = new \Mustache_Engine(['escape' => function ($value) { |
|
13 | + $m = new \Mustache_Engine(['escape' => function($value) { |
|
14 | 14 | if (str_replace('*[[DONOTESCAPE]]*', '', $value) != $value) { |
15 | - $value = str_replace('&','&',$value); |
|
15 | + $value = str_replace('&', '&', $value); |
|
16 | 16 | return str_replace('*[[DONOTESCAPE]]*', '', $value); |
17 | 17 | } |
18 | 18 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | return preg_replace_callback( |
34 | 34 | '/{{(.*?)}}/', |
35 | - function ($match) { |
|
35 | + function($match) { |
|
36 | 36 | return strip_tags($match[0]); |
37 | 37 | }, |
38 | 38 | preg_replace("/(?<!{){(?!{)<\/w:t>[\s\S]*?<w:t>{/", '{{', $content) |
@@ -41,27 +41,27 @@ discard block |
||
41 | 41 | $value_array[] = $tag_open_values[0]; |
42 | 42 | $value_array[] = '</w:t></w:r>'; |
43 | 43 | |
44 | - if($tag=="u") |
|
44 | + if ($tag == "u") |
|
45 | 45 | { |
46 | 46 | $tag_ooxml = 'u w:val="single" '; |
47 | 47 | $loose_formatting = ""; |
48 | 48 | } |
49 | - elseif($tag=="b") |
|
49 | + elseif ($tag == "b") |
|
50 | 50 | { |
51 | 51 | $tag_ooxml = 'b '; |
52 | 52 | $loose_formatting = ""; |
53 | 53 | } |
54 | - elseif($tag=="strong") |
|
54 | + elseif ($tag == "strong") |
|
55 | 55 | { |
56 | 56 | $tag_ooxml = 'b '; |
57 | 57 | $loose_formatting = ""; |
58 | 58 | } |
59 | - elseif($tag=="i") |
|
59 | + elseif ($tag == "i") |
|
60 | 60 | { |
61 | 61 | $tag_ooxml = 'i '; |
62 | 62 | $loose_formatting = "<w:i w:val=\"0\"/>"; |
63 | 63 | } |
64 | - elseif($tag=="em") |
|
64 | + elseif ($tag == "em") |
|
65 | 65 | { |
66 | 66 | $tag_ooxml = 'i '; |
67 | 67 | $loose_formatting = "<w:i w:val=\"0\"/>"; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $wrPr_open = strrpos($tag_open_values[0], '<w:rPr>'); |
72 | 72 | $wrPr_close = strrpos($tag_open_values[0], '</w:rPr>', $wrPr_open); |
73 | 73 | $neutral_style = '<w:r><w:rPr>'.substr($tag_open_values[0], ($wrPr_open + 7), ($wrPr_close - ($wrPr_open + 7))).'</w:rPr><w:t xml:space="preserve">'; |
74 | - $tagged_style = '<w:r><w:rPr><w:'.$tag_ooxml.'/>'.str_replace($loose_formatting,"",substr($tag_open_values[0], ($wrPr_open + 7), ($wrPr_close - ($wrPr_open + 7)))).'</w:rPr><w:t xml:space="preserve">'; |
|
74 | + $tagged_style = '<w:r><w:rPr><w:'.$tag_ooxml.'/>'.str_replace($loose_formatting, "", substr($tag_open_values[0], ($wrPr_open + 7), ($wrPr_close - ($wrPr_open + 7)))).'</w:rPr><w:t xml:space="preserve">'; |
|
75 | 75 | |
76 | 76 | //open new text run and make it bold, include previous styling |
77 | 77 | $value_array[] = $tagged_style; |
@@ -45,23 +45,19 @@ |
||
45 | 45 | { |
46 | 46 | $tag_ooxml = 'u w:val="single" '; |
47 | 47 | $loose_formatting = ""; |
48 | - } |
|
49 | - elseif($tag=="b") |
|
48 | + } elseif($tag=="b") |
|
50 | 49 | { |
51 | 50 | $tag_ooxml = 'b '; |
52 | 51 | $loose_formatting = ""; |
53 | - } |
|
54 | - elseif($tag=="strong") |
|
52 | + } elseif($tag=="strong") |
|
55 | 53 | { |
56 | 54 | $tag_ooxml = 'b '; |
57 | 55 | $loose_formatting = ""; |
58 | - } |
|
59 | - elseif($tag=="i") |
|
56 | + } elseif($tag=="i") |
|
60 | 57 | { |
61 | 58 | $tag_ooxml = 'i '; |
62 | 59 | $loose_formatting = "<w:i w:val=\"0\"/>"; |
63 | - } |
|
64 | - elseif($tag=="em") |
|
60 | + } elseif($tag=="em") |
|
65 | 61 | { |
66 | 62 | $tag_ooxml = 'i '; |
67 | 63 | $loose_formatting = "<w:i w:val=\"0\"/>"; |