From 9e7cbdc00a4bca29af62ee2ee761afb1b08179a0 Mon Sep 17 00:00:00 2001
From: systopia <endres@systopia.de>
Date: Fri, 17 Nov 2017 15:43:40 +0100
Subject: [PATCH] fixed static mail

---
 de.systopia.civiproxy/info.xml | 4 ++--
 proxy/proxy.php                | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/de.systopia.civiproxy/info.xml b/de.systopia.civiproxy/info.xml
index c9b903f..61f7fd7 100644
--- a/de.systopia.civiproxy/info.xml
+++ b/de.systopia.civiproxy/info.xml
@@ -8,8 +8,8 @@
     <author>B. Endres</author>
     <email>endres@systopia.de</email>
   </maintainer>
-  <releaseDate>2017-09-06</releaseDate>
-  <version>0.5.dev</version>
+  <releaseDate>2017-11-17</releaseDate>
+  <version>0.5.1.dev</version>
   <develStage>dev</develStage>
   <compatibility>
     <ver>4.4</ver>
diff --git a/proxy/proxy.php b/proxy/proxy.php
index 67bd4d2..4375ada 100644
--- a/proxy/proxy.php
+++ b/proxy/proxy.php
@@ -8,7 +8,7 @@
 +---------------------------------------------------------*/
 
 require_once "config.php";
-$civiproxy_version = '0.5.dev';
+$civiproxy_version = '0.5.1.dev';
 $civiproxy_logo    = "<img src='{$proxy_base}/static/images/proxy-logo.png' alt='SYSTOPIA Organisationsberatung'></img>";
 
 /**
@@ -97,7 +97,7 @@ function civiproxy_redirect($url_requested, $parameters) {
  *  so they will point to this proxy instead
  */
 function civiproxy_mend_URLs(&$string) {
-  global $target_rest, $target_url, $target_open, $target_file, $target_mail, $proxy_base;
+  global $target_rest, $target_url, $target_open, $target_file, $target_mail, $proxy_base, $target_mosaico;
 
   if ($target_rest) {
     $string = preg_replace("#{$target_rest}#", $proxy_base . '/rest.php', $string);
@@ -115,7 +115,9 @@ function civiproxy_mend_URLs(&$string) {
     $string = preg_replace("#{$target_file}#", $proxy_base . '/file.php?id=', $string);
   }
   if ($target_mosaico) {
-    $string = preg_replace("#{$target_mosaico}#", $proxy_base . '/mosaico.php?id=', $string);
+    // replace full, and relative URL
+    $string = preg_replace("#{$target_mosaico}#",           $proxy_base . '/mosaico.php?id=', $string);
+    $string = preg_replace("#/civicrm/mosaico/img\\?src=#", $proxy_base . '/mosaico.php?id=', $string);
   }
 }