Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 08:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let PECL::isSupported() return false instead

Browse source
This commit is contained in:
the-djmaze 2024-03-18 17:51:56 +01:00
parent b98b21c1c6
commit c2c72dc4be
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
View file

@ -12,7 +12,7 @@ abstract class GnuPG
{ {
public static function isSupported() : bool public static function isSupported() : bool
{ {
return GPG::isSupported(); return GPG::isSupported() || PECL::isSupported();
} }
private static $instance = null; private static $instance = null;
@ -22,11 +22,9 @@ abstract class GnuPG
if (GPG::isSupported()) { if (GPG::isSupported()) {
static::$instance = new GPG($homedir); static::$instance = new GPG($homedir);
} }
/*
else if (PECL::isSupported()) { else if (PECL::isSupported()) {
static::$instance = new PECL($homedir); static::$instance = new PECL($homedir);
} }
*/
} }
return static::$instance; return static::$instance;
} }

3
snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php
View file

@ -56,7 +56,8 @@ class PECL implements \SnappyMail\PGP\PGPInterface
public static function isSupported() : bool public static function isSupported() : bool
{ {
return \class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>='); // Disabled due to failures with "no passphrase" while a passphrase does exist
return false && \class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>=');
} }
public function gnupgError() public function gnupgError()