From fe88947796493242d7686d831a90fec889014dd2 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 17 Jun 2019 10:56:28 +0000 Subject: [PATCH] Release master - Improved logs --- madeline.phar | Bin 9683020 -> 9683020 bytes phar.php | 60 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/madeline.phar b/madeline.phar index 994d7aa79b2abdbbc00b4e03114112ed17af291f..a918d55ad4652ba8f6e93f4657a2c01a79ac5145 100644 GIT binary patch delta 13581 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 J4G4=3`#+xB0`>p^ delta 13685 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 diff --git a/phar.php b/phar.php index 2a0b190..a5ea78e 100644 --- a/phar.php +++ b/phar.php @@ -1,27 +1,36 @@ '.$newline; - echo "**********************************************************************$newline"; - echo "**********************************************************************$newline$newline"; - echo "YOU ARE USING AN OLD AND BUGGED VERSION OF PHP, PLEASE UPDATE TO PHP 7$newline"; - echo "PHP 5 USERS WILL NOT RECEIVE MADELINEPROTO UPDATES AND BUGFIXES$newline$newline"; - echo "SUPPORTED VERSIONS: PHP 7.0, 7.1, 7.2, 7.3+$newline"; - echo "RECOMMENDED VERSION: PHP 7.3$newline$newline"; - echo "**********************************************************************$newline"; - echo "**********************************************************************$newline"; - unset($newline); -} - function ___install_madeline() { if (count(debug_backtrace(0)) === 1) { die('You must include this file in another PHP script'.PHP_EOL); } + $old = false; + if (PHP_MAJOR_VERSION === 5) { + if (PHP_MINOR_VERSION < 6) { + throw new \Exception('MadelineProto requires at least PHP 7.1 to run'); + } + $old = true; + } + if (PHP_MAJOR_VERSION === 7 && PHP_MINOR_VERSION === 0) { + $old = true; + } + if ($old) { + $newline = PHP_EOL; + if (php_sapi_name() !== 'cli') { + $newline = '
'.$newline; + } + echo "**********************************************************************************$newline"; + echo "**********************************************************************************$newline$newline"; + echo "YOU ARE USING AN OLD AND BUGGED VERSION OF PHP, PLEASE UPDATE TO PHP 7.3$newline"; + echo "PHP 5/7.0 USERS WILL NOT RECEIVE PHP UPDATES AND BUGFIXES: https://www.php.net/eol.php$newline"; + echo "PHP 5/7.0 USERS WILL NOT RECEIVE MADELINEPROTO UPDATES AND BUGFIXES$newline$newline"; + echo "SUPPORTED VERSIONS: PHP 7.1, 7.2, 7.3+$newline"; + echo "RECOMMENDED VERSION: PHP 7.3$newline$newline"; + echo "**********************************************************************************$newline"; + echo "**********************************************************************************$newline"; + unset($newline); + } // MTProxy update $file = debug_backtrace(0, 1)[0]['file']; @@ -39,19 +48,26 @@ function ___install_madeline() $release_template = 'https://phar.madelineproto.xyz/release%s?v=new'; $phar_template = 'https://phar.madelineproto.xyz/madeline%s.phar?v=new'; + // Version definition $release_branch = defined('MADELINE_BRANCH') ? '-'.MADELINE_BRANCH : '-old'; - $release_default = ''; + if ($release_branch === '-') { + $release_branch = ''; + } + $release_default_branch = ''; - if (PHP_MAJOR_VERSION === 5) { + if (PHP_MAJOR_VERSION <= 5) { $release_branch = '5'.$release_branch; - $release_default = '5'; + $release_default_branch = '5'; + } elseif (PHP_MINOR_VERSION >= 3) { + $release_branch = ''; } + // Checking if defined branch/default branch builds can be downloaded if (!($release = @file_get_contents(sprintf($release_template, $release_branch)))) { - if (!($release = @file_get_contents(sprintf($release_template, $release_default)))) { + if (!($release = @file_get_contents(sprintf($release_template, $release_default_branch)))) { return; } - $release_branch = $release_default; + $release_branch = $release_default_branch; } if (!file_exists('madeline.phar') || !file_exists('madeline.phar.version') || file_get_contents('madeline.phar.version') !== $release) {