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

Merge pull request #47 from codebymikey/codebymikey-version-regex 

Add ability to match pre-releases and build labels e.g. "-dev"
This commit is contained in:
Björn Endres 2020-10-12 11:49:02 +02:00 committed by GitHub
parent bbf5c3c9e9 21f2d22506
commit aaa7cccc26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
de.systopia.civiproxy/CRM/Admin/Form/Setting/ProxySettings.php
View File

@ -105,9 +105,9 @@ class CRM_Admin_Form_Setting_ProxySettings extends CRM_Admin_Form_Setting
if($response === FALSE) { if($response === FALSE) {
return array('is_error' => 1, 'message' => sprintf(ts('Error: cannot access "%s"'), $url)); return array('is_error' => 1, 'message' => sprintf(ts('Error: cannot access "%s"'), $url));
}else{ }else{
$result = preg_match("/<p id=\"version\">CiviProxy Version ([0-9]+\.[0-9]+|[0-9]+\.[0-9]+\.[0-9]+)<\/p>/", $response, $output_array); $result = preg_match("/<p id=\"version\">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){ 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{ }else{
return array('is_error' => 0, 'version' => $output_array[1]); return array('is_error' => 0, 'version' => $output_array[1]);
} }