@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | case LIBXML_ERR_WARNING: |
| 370 | 370 | $return .= "Warning $error->code: "; |
| 371 | 371 | break; |
| 372 | - case LIBXML_ERR_ERROR: |
|
| 372 | + case LIBXML_ERR_ERROR: |
|
| 373 | 373 | $return .= "Error $error->code: "; |
| 374 | 374 | break; |
| 375 | 375 | case LIBXML_ERR_FATAL: |
@@ -378,8 +378,8 @@ discard block |
||
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | $return .= trim($error->message) . |
| 381 | - "\n Line: $error->line" . |
|
| 382 | - "\n Column: $error->column"; |
|
| 381 | + "\n Line: $error->line" . |
|
| 382 | + "\n Column: $error->column"; |
|
| 383 | 383 | |
| 384 | 384 | if ($error->file) { |
| 385 | 385 | $return .= "\n File: $error->file"; |
@@ -341,8 +341,7 @@ |
||
| 341 | 341 | } else { |
| 342 | 342 | throw new Exception('Cannot generate xml for word/document.xml.'); |
| 343 | 343 | } |
| 344 | - } |
|
| 345 | - else |
|
| 344 | + } else |
|
| 346 | 345 | { |
| 347 | 346 | $xmlerror = ''; |
| 348 | 347 | $errors = libxml_get_errors(); |
@@ -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 | |