@@ -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);  | 
                                                        
@@ -102,6 +102,9 @@ discard block  | 
                                                    ||
| 102 | 102 | ->extractTo($this->StoragePath($this->local_path), [$file], \Wrklst\Zipper\Zipper::WHITELIST);  | 
                                                        
| 103 | 103 | }  | 
                                                        
| 104 | 104 | |
| 105 | + /**  | 
                                                        |
| 106 | + * @param string $file  | 
                                                        |
| 107 | + */  | 
                                                        |
| 105 | 108 | protected function ReadOpenXmlFile($file, $type = 'file')  | 
                                                        
| 106 | 109 |      { | 
                                                        
| 107 | 110 | $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()) { | 
                                                        
@@ -143,6 +150,9 @@ discard block  | 
                                                    ||
| 143 | 150 | }  | 
                                                        
| 144 | 151 | }  | 
                                                        
| 145 | 152 | |
| 153 | + /**  | 
                                                        |
| 154 | + * @param integer $dpi  | 
                                                        |
| 155 | + */  | 
                                                        |
| 146 | 156 | public function ReadTeamplate($dpi)  | 
                                                        
| 147 | 157 |      { | 
                                                        
| 148 | 158 |          $this->Log('Analyze Template'); | 
                                                        
@@ -191,6 +201,9 @@ discard block  | 
                                                    ||
| 191 | 201 | }  | 
                                                        
| 192 | 202 | }  | 
                                                        
| 193 | 203 | |
| 204 | + /**  | 
                                                        |
| 205 | + * @param \SimpleXMLElement $main_file  | 
                                                        |
| 206 | + */  | 
                                                        |
| 194 | 207 | protected function FetchReplaceableImages(&$main_file, $ns)  | 
                                                        
| 195 | 208 |      { | 
                                                        
| 196 | 209 | //set up basic arrays to keep track of imgs  | 
                                                        
@@ -52,7 +52,7 @@ discard block  | 
                                                    ||
| 52 | 52 |      { | 
                                                        
| 53 | 53 | $this->CopyTmplate();  | 
                                                        
| 54 | 54 | $this->getAllFilesFromDocx();  | 
                                                        
| 55 | -        foreach($this->filelist as $file) { | 
                                                        |
| 55 | +        foreach ($this->filelist as $file) { | 
                                                        |
| 56 | 56 | $this->doInplaceMustache($file);  | 
                                                        
| 57 | 57 | }  | 
                                                        
| 58 | 58 | $this->ReadTeamplate($dpi);  | 
                                                        
@@ -106,9 +106,9 @@ discard block  | 
                                                    ||
| 106 | 106 | $fileWhitelist = $this->fileWhitelist;  | 
                                                        
| 107 | 107 | $this->zipper  | 
                                                        
| 108 | 108 | ->make($this->StoragePath($this->local_path.$this->template_file_name))  | 
                                                        
| 109 | -            ->getRepository()->each(function ($file, $stats) use ($fileWhitelist, &$filelist) { | 
                                                        |
| 110 | -                foreach($fileWhitelist as $pattern) { | 
                                                        |
| 111 | -                    if(fnmatch($pattern, $file)) { | 
                                                        |
| 109 | +            ->getRepository()->each(function($file, $stats) use ($fileWhitelist, &$filelist) { | 
                                                        |
| 110 | +                foreach ($fileWhitelist as $pattern) { | 
                                                        |
| 111 | +                    if (fnmatch($pattern, $file)) { | 
                                                        |
| 112 | 112 | $filelist[] = $file;  | 
                                                        
| 113 | 113 | }  | 
                                                        
| 114 | 114 | }  | 
                                                        
@@ -122,7 +122,7 @@ discard block  | 
                                                    ||
| 122 | 122 | ->getFileContent($file);  | 
                                                        
| 123 | 123 | $tempFileContent = MustacheRender::render($this->items, $tempFileContent);  | 
                                                        
| 124 | 124 | $tempFileContent = HtmlConversion::convert($tempFileContent);  | 
                                                        
| 125 | - $this->zipper->addString($file,$tempFileContent);  | 
                                                        |
| 125 | + $this->zipper->addString($file, $tempFileContent);  | 
                                                        |
| 126 | 126 | $this->zipper->close();  | 
                                                        
| 127 | 127 | }  | 
                                                        
| 128 | 128 | |