diff --git a/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.hlp b/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.hlp index dd49f2a..1db0b3a 100644 --- a/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.hlp +++ b/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.hlp @@ -1,7 +1,6 @@ {htxt id='id-proxy-enabled'}

- {ts}Enable CiviProxy{/ts} - {ts}This will cause all resource URLs (images, URL trackers, mail open tracers, etc.) to point to the proxy.{/ts} + {ts}Activating CiviProxy will cause all resource URLs (images, URL trackers, mail open tracers, etc.) to point to the proxy.{/ts}

{/htxt} @@ -13,7 +12,7 @@ {htxt id='id-proxy-version'}

- {ts}TODO #1{/ts} + {ts}This is the CiviProxy version as reported by the installation at the given URL.{/ts}

{/htxt} diff --git a/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.tpl b/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.tpl index b66bfb1..a331ade 100644 --- a/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.tpl +++ b/de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.tpl @@ -1,27 +1,28 @@
-

{ts}Core Settings{/ts}

+

{ts}Basic Settings{/ts}

- + - + - +
{$form.proxy_url.label}  {$form.proxy_url.label}   {$form.proxy_url.html}
{$form.proxy_version.label}  {$form.proxy_version.label}   {$form.proxy_version.html}
+ {* ==== advanced settings disabled ========
-

{ts}Component Settings{/ts}

+

{ts}Advanced Settings{/ts}

@@ -33,6 +34,7 @@ + ==== advanced settings disabled ======== *}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/proxy/config.php b/proxy/config.php index 28a0cca..f9f8e79 100644 --- a/proxy/config.php +++ b/proxy/config.php @@ -11,8 +11,11 @@ /**************************************************************** ** URLS ** ****************************************************************/ -$target_civicrm = 'https://crmtest.muslimehelfen.org'; +// this should point to the base address of the CiviProxy installation $proxy_base = 'https://ssl.webpack.de/wp11230065.server-he.de'; + +// this should point to the target CiviCRM system +$target_civicrm = 'https://crmtest.muslimehelfen.org'; //$proxy_base = 'http://localhost:8888/proxy';