diff --git a/admin/includes/languages/english/modules/security_check/github_directory.php b/admin/includes/languages/english/modules/security_check/github_directory.php new file mode 100644 index 000000000..0fe62368c --- /dev/null +++ b/admin/includes/languages/english/modules/security_check/github_directory.php @@ -0,0 +1,18 @@ +title = MODULE_SECURITY_CHECK_GITHUB_TITLE; + } + + function pass() { + return !file_exists(DIR_FS_CATALOG . '.github'); + } + + function getMessage() { + return MODULE_SECURITY_CHECK_GITHUB_DIRECTORY_EXISTS; + } + } + \ No newline at end of file diff --git a/admin/version_check.php b/admin/version_check.php index 2065913a2..2fa09fe03 100755 --- a/admin/version_check.php +++ b/admin/version_check.php @@ -23,6 +23,15 @@ $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, 'https://www.oscommerce.com/version/online_merchant/ce/phoenix/' . $major_version); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + if ( file_exists(DIR_FS_CATALOG . 'includes/cacert.pem') ) { + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); + curl_setopt($ch, CURLOPT_CAINFO, DIR_FS_CATALOG . 'includes/cacert.pem'); + } + else { + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + } + $response = trim(curl_exec($ch)); curl_close($ch); diff --git a/advanced_search.php b/advanced_search.php index faf1553d2..ccd1c7e79 100644 --- a/advanced_search.php +++ b/advanced_search.php @@ -108,11 +108,13 @@ function check_form() {