@@ -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); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | //rework img to new size and jpg format |
| 46 | 46 | $img_rework = \Image::make($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'])); |
| 47 | - if($dpi!=72) $img_rework2 = \Image::make($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'])); |
|
| 47 | + if ($dpi != 72) $img_rework2 = \Image::make($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'])); |
|
| 48 | 48 | |
| 49 | 49 | $imgWidth = $img_rework->width(); |
| 50 | 50 | $imgHeight = $img_rework->height(); |
@@ -73,17 +73,17 @@ discard block |
||
| 73 | 73 | //for getting non high dpi measurements, as the document is on 72 dpi. |
| 74 | 74 | //TODO: this should be improved. it does not really need the resampling to identify the new sizes. |
| 75 | 75 | //instead this should just be calculated, as resampling the image is too process instensive. |
| 76 | - $img_rework->resize($w, $h, function ($constraint) { |
|
| 76 | + $img_rework->resize($w, $h, function($constraint) { |
|
| 77 | 77 | $constraint->aspectRatio(); |
| 78 | 78 | $constraint->upsize(); |
| 79 | 79 | }); |
| 80 | 80 | $new_height = $img_rework->height(); |
| 81 | 81 | $new_width = $img_rework->width(); |
| 82 | 82 | |
| 83 | - if($dpi!=72) |
|
| 83 | + if ($dpi != 72) |
|
| 84 | 84 | { |
| 85 | 85 | //for storing the image in high dpi, so it has good quality on high dpi screens |
| 86 | - $img_rework2->resize(((int)$w*($dpi/72)), $h, function ($constraint) { // make high dpi version for actual storage |
|
| 86 | + $img_rework2->resize(((int) $w * ($dpi / 72)), $h, function($constraint) { // make high dpi version for actual storage |
|
| 87 | 87 | $constraint->aspectRatio(); |
| 88 | 88 | $constraint->upsize(); |
| 89 | 89 | }); |
@@ -44,7 +44,9 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | //rework img to new size and jpg format |
| 46 | 46 | $img_rework = \Image::make($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'])); |
| 47 | - if($dpi!=72) $img_rework2 = \Image::make($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'])); |
|
| 47 | + if($dpi!=72) { |
|
| 48 | + $img_rework2 = \Image::make($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_src'])); |
|
| 49 | + } |
|
| 48 | 50 | |
| 49 | 51 | $imgWidth = $img_rework->width(); |
| 50 | 52 | $imgHeight = $img_rework->height(); |
@@ -97,8 +99,7 @@ discard block |
||
| 97 | 99 | $im->clear(); |
| 98 | 100 | $im->destroy(); |
| 99 | 101 | */ |
| 100 | - } |
|
| 101 | - else { |
|
| 102 | + } else { |
|
| 102 | 103 | $img_rework->save($parent->StoragePath($parent->local_path.'word/media/'.$imgs[$k]['img_file_dest'])); |
| 103 | 104 | } |
| 104 | 105 | |
@@ -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 |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $this->verbose = false; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function Execute($dpi=72) |
|
| 42 | + public function Execute($dpi = 72) |
|
| 43 | 43 | { |
| 44 | 44 | $this->CopyTmplate(); |
| 45 | 45 | $this->ReadTeamplate($dpi); |
@@ -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); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | libxml_use_internal_errors(true); |
| 314 | 314 | $main_file = simplexml_load_string($this->word_doc); |
| 315 | 315 | |
| 316 | - if(gettype($main_file) == "object") |
|
| 316 | + if (gettype($main_file) == "object") |
|
| 317 | 317 | { |
| 318 | 318 | $this->Log('Merge Images into Template'); |
| 319 | 319 | |
@@ -362,8 +362,8 @@ discard block |
||
| 362 | 362 | */ |
| 363 | 363 | protected function display_xml_error($error, $xml) |
| 364 | 364 | { |
| 365 | - $return = $xml[$error->line - 1] . "\n"; |
|
| 366 | - $return .= str_repeat('-', $error->column) . "^\n"; |
|
| 365 | + $return = $xml[$error->line - 1]."\n"; |
|
| 366 | + $return .= str_repeat('-', $error->column)."^\n"; |
|
| 367 | 367 | |
| 368 | 368 | switch ($error->level) { |
| 369 | 369 | case LIBXML_ERR_WARNING: |
@@ -377,8 +377,8 @@ discard block |
||
| 377 | 377 | break; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | - $return .= trim($error->message) . |
|
| 381 | - "\n Line: $error->line" . |
|
| 380 | + $return .= trim($error->message). |
|
| 381 | + "\n Line: $error->line". |
|
| 382 | 382 | "\n Column: $error->column"; |
| 383 | 383 | |
| 384 | 384 | if ($error->file) { |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | $valid = true; |
| 422 | 422 | |
| 423 | 423 | //TODO: create a better url validity check |
| 424 | - if (! trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
| 424 | + if (!trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
| 425 | 425 | $valid = false; |
| 426 | 426 | } |
| 427 | 427 | $mode = 'url'; |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $valid = true; |
| 445 | 445 | |
| 446 | 446 | //check if path starts with storage path |
| 447 | - if (! starts_with($path, storage_path())) { |
|
| 447 | + if (!starts_with($path, storage_path())) { |
|
| 448 | 448 | $valid = false; |
| 449 | 449 | } |
| 450 | 450 | $mode = 'path'; |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | //wait until process is ready |
| 483 | 483 | } |
| 484 | 484 | // executes after the command finishes |
| 485 | - if (! $process->isSuccessful()) { |
|
| 485 | + if (!$process->isSuccessful()) { |
|
| 486 | 486 | throw new \Symfony\Component\Process\Exception\ProcessFailedException($process); |
| 487 | 487 | } else { |
| 488 | 488 | $path_parts = pathinfo($this->StoragePath($this->local_path.$this->template_file_name)); |