From: Edward Date: Tue, 19 Feb 2019 10:18:41 +0000 (+0800) Subject: Fix #5648 - New design for post release report X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=81b82c12f33746b22863df989c119918a371013e Fix #5648 - New design for post release report --- diff --git a/Images.php b/Images.php index 68cc3627..3a4b741b 100644 --- a/Images.php +++ b/Images.php @@ -44,6 +44,8 @@ class Pman_Core_Images extends Pman // tables that do not need authentication checks before serving. var $public_image_tables = array(); + var $is_email = false; + var $sizes = array( '100', '100x100', @@ -83,6 +85,10 @@ class Pman_Core_Images extends Pman // return $this->post(); //} + if(!empty($_REQUEST['is_email'])) { + $this->is_email = true; + } + $this->as_mimetype = empty($_REQUEST['as']) ? '' : $_REQUEST['as']; $this->page = empty($_REQUEST['page']) ? false : (int) $_REQUEST['page']; @@ -184,6 +190,10 @@ class Pman_Core_Images extends Pman if (!$this->authUser && !in_array($img->ontable,$this->public_image_tables)) { + if($this->is_email) { + return $this->serve($img); + } + if ($img->ontable != 'core_company') { $this->imgErr("not-authenticated {$img->ontable}",$s); } diff --git a/Mailer.php b/Mailer.php index 7da09a83..1211e4ee 100644 --- a/Mailer.php +++ b/Mailer.php @@ -588,6 +588,7 @@ class Pman_Core_Mailer { $real_url = str_replace(' ', '%20', $this->mapurl($url)); $a = new HTTP_Request($real_url); + $a->addQueryString('is_email', 1); $a->sendRequest(); $data = $a->getResponseBody();