@@ -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); |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | $valid = true; |
| 369 | 369 | |
| 370 | 370 | //TODO: create a better url validity check |
| 371 | - if (! trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
| 371 | + if (!trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
| 372 | 372 | $valid = false; |
| 373 | 373 | } |
| 374 | 374 | $mode = 'url'; |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | $valid = true; |
| 392 | 392 | |
| 393 | 393 | //check if path starts with storage path |
| 394 | - if (! starts_with($path, storage_path())) { |
|
| 394 | + if (!starts_with($path, storage_path())) { |
|
| 395 | 395 | $valid = false; |
| 396 | 396 | } |
| 397 | 397 | $mode = 'path'; |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | //wait until process is ready |
| 423 | 423 | } |
| 424 | 424 | // executes after the command finishes |
| 425 | - if (! $process->isSuccessful()) { |
|
| 425 | + if (!$process->isSuccessful()) { |
|
| 426 | 426 | throw new \Symfony\Component\Process\Exception\ProcessFailedException($process); |
| 427 | 427 | } else { |
| 428 | 428 | $path_parts = pathinfo($this->StoragePath($this->local_path.$this->template_file_name)); |
@@ -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); |
@@ -133,6 +136,10 @@ discard block |
||
| 133 | 136 | } |
| 134 | 137 | } |
| 135 | 138 | |
| 139 | + /** |
|
| 140 | + * @param string $file |
|
| 141 | + * @param false|string $folder |
|
| 142 | + */ |
|
| 136 | 143 | protected function SaveOpenXmlObjectToFile($xmlObject, $file, $folder) |
| 137 | 144 | { |
| 138 | 145 | if ($xmlString = $xmlObject->asXML()) { |
@@ -142,6 +149,9 @@ discard block |
||
| 142 | 149 | } |
| 143 | 150 | } |
| 144 | 151 | |
| 152 | + /** |
|
| 153 | + * @param integer $dpi |
|
| 154 | + */ |
|
| 145 | 155 | public function ReadTeamplate($dpi) |
| 146 | 156 | { |
| 147 | 157 | $this->Log('Analyze Template'); |
@@ -190,6 +200,9 @@ discard block |
||
| 190 | 200 | } |
| 191 | 201 | } |
| 192 | 202 | |
| 203 | + /** |
|
| 204 | + * @param \SimpleXMLElement $main_file |
|
| 205 | + */ |
|
| 193 | 206 | protected function FetchReplaceableImages(&$main_file, $ns) |
| 194 | 207 | { |
| 195 | 208 | //set up basic arrays to keep track of imgs |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | case LIBXML_ERR_WARNING: |
| 368 | 368 | $return .= "Warning $error->code: "; |
| 369 | 369 | break; |
| 370 | - case LIBXML_ERR_ERROR: |
|
| 370 | + case LIBXML_ERR_ERROR: |
|
| 371 | 371 | $return .= "Error $error->code: "; |
| 372 | 372 | break; |
| 373 | 373 | case LIBXML_ERR_FATAL: |
@@ -376,8 +376,8 @@ discard block |
||
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | $return .= trim($error->message). |
| 379 | - "\n Line: $error->line". |
|
| 380 | - "\n Column: $error->column"; |
|
| 379 | + "\n Line: $error->line". |
|
| 380 | + "\n Column: $error->column"; |
|
| 381 | 381 | |
| 382 | 382 | if ($error->file) { |
| 383 | 383 | $return .= "\n File: $error->file"; |
@@ -10,7 +10,7 @@ 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 | 15 | $value = str_replace('&', '&', $value); |
| 16 | 16 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | return preg_replace_callback( |
| 35 | 35 | '/{{(.*?)}}/', |
| 36 | - function ($match) { |
|
| 36 | + function($match) { |
|
| 37 | 37 | return strip_tags($match[0]); |
| 38 | 38 | }, |
| 39 | 39 | preg_replace("/(?<!{){(?!{)<\/w:t>[\s\S]*?<w:t>{/", '{{', $content) |
@@ -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(); |
@@ -38,6 +41,10 @@ discard block |
||
| 38 | 41 | return false; |
| 39 | 42 | } |
| 40 | 43 | |
| 44 | + /** |
|
| 45 | + * @param DocxMustache $parent |
|
| 46 | + * @param string $data |
|
| 47 | + */ |
|
| 41 | 48 | public function ResampleImage($parent, $imgs, $k, $data, $dpi = 72) |
| 42 | 49 | { |
| 43 | 50 | \Storage::disk($parent->storageDisk)->put($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'], $data); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | //for getting non high dpi measurements, as the document is on 72 dpi. |
| 76 | 76 | //TODO: this should be improved. it does not really need the resampling to identify the new sizes. |
| 77 | 77 | //instead this should just be calculated, as resampling the image is too process instensive. |
| 78 | - $img_rework->resize($w, $h, function ($constraint) { |
|
| 78 | + $img_rework->resize($w, $h, function($constraint) { |
|
| 79 | 79 | $constraint->aspectRatio(); |
| 80 | 80 | $constraint->upsize(); |
| 81 | 81 | }); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | if ($dpi != 72) { |
| 86 | 86 | //for storing the image in high dpi, so it has good quality on high dpi screens |
| 87 | - $img_rework2->resize(((int) $w * ($dpi / 72)), $h, function ($constraint) { // make high dpi version for actual storage |
|
| 87 | + $img_rework2->resize(((int) $w * ($dpi / 72)), $h, function($constraint) { // make high dpi version for actual storage |
|
| 88 | 88 | $constraint->aspectRatio(); |
| 89 | 89 | $constraint->upsize(); |
| 90 | 90 | }); |