From 21f2d22506fd5eaa5cd4e107af60b75817597669 Mon Sep 17 00:00:00 2001 From: Michael S Date: Mon, 12 Oct 2020 09:22:51 +0100 Subject: [PATCH] Update ProxySettings.php #46 Add ability to match pre-releases and build labels e.g. "-dev" --- .../CRM/Admin/Form/Setting/ProxySettings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.systopia.civiproxy/CRM/Admin/Form/Setting/ProxySettings.php b/de.systopia.civiproxy/CRM/Admin/Form/Setting/ProxySettings.php index f2ae02b..524fd94 100644 --- a/de.systopia.civiproxy/CRM/Admin/Form/Setting/ProxySettings.php +++ b/de.systopia.civiproxy/CRM/Admin/Form/Setting/ProxySettings.php @@ -105,9 +105,9 @@ class CRM_Admin_Form_Setting_ProxySettings extends CRM_Admin_Form_Setting if($response === FALSE) { return array('is_error' => 1, 'message' => sprintf(ts('Error: cannot access "%s"'), $url)); }else{ - $result = preg_match("/

CiviProxy Version ([0-9]+\.[0-9]+|[0-9]+\.[0-9]+\.[0-9]+)<\/p>/", $response, $output_array); + $result = preg_match("/

CiviProxy Version (([0-9]+\.[0-9]+|[0-9]+\.[0-9]+\.[0-9]+)(?:-[0-9A-Za-z-]+)?)<\/p>/", $response, $output_array); if ($result === FALSE || $result === 0){ - return array('is_error' => 1, 'message' => sprintf(ts('Error: failed to parse version information'), $url)); + return array('is_error' => 1, 'message' => sprintf(ts('Error: failed to parse version information: (%s)'), $url)); }else{ return array('is_error' => 0, 'version' => $output_array[1]); }