marc
/
CiviProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28 from pbatroff/dev_27 

Fix for #27: Correct link generation. Needs a bit more testing
This commit is contained in:
Björn Endres 2019-09-24 14:14:18 +02:00 committed by GitHub
parent 9b4c5f8f99 d4853095ce
commit ccb0c41377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/proxy.php
View File

@ -96,7 +96,7 @@ function civiproxy_redirect($url_requested, $parameters) {
* so they will point to this proxy instead * so they will point to this proxy instead
*/ */
function civiproxy_mend_URLs(&$string) { function civiproxy_mend_URLs(&$string) {
global $target_rest, $target_url, $target_open, $target_file, $target_mail, $proxy_base, $target_mosaico; global $target_rest, $target_url, $target_open, $target_file, $target_mail, $proxy_base, $target_mosaico, $target_civicrm;
if ($target_rest) { if ($target_rest) {
$string = preg_replace("#{$target_rest}#", $proxy_base . '/rest.php', $string); $string = preg_replace("#{$target_rest}#", $proxy_base . '/rest.php', $string);
@ -115,8 +115,8 @@ function civiproxy_mend_URLs(&$string) {
} }
if ($target_mosaico) { if ($target_mosaico) {
// replace full, and relative URL // replace full, and relative URL
$string = preg_replace("#{$target_mosaico}#", $proxy_base . '/mosaico.php?id=', $string); // $string = preg_replace("#{$target_mosaico}#", $proxy_base . '/mosaico.php?id=', $string);
$string = preg_replace("#/civicrm/mosaico/img\\?src=#", $proxy_base . '/mosaico.php?id=', $string); $string = preg_replace("#{$target_civicrm}/civicrm/mosaico/img\?src=#", $proxy_base . '/mosaico.php?id=', $string);
} }
} }