From 31c9a0010f22bbd3b4d571b9dc898456000220e5 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Tue, 15 Oct 2013 16:28:16 -0400 Subject: [PATCH 1/3] Added freenode.txt for Freenode IRC channel verification (to reclaim #airtime) --- freenode.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 freenode.txt diff --git a/freenode.txt b/freenode.txt new file mode 100644 index 000000000..144b03df4 --- /dev/null +++ b/freenode.txt @@ -0,0 +1 @@ +RtGxyZuE From d4dae440f01118f1bea815f9b254b95d58f78c66 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 25 Oct 2013 10:39:00 -0400 Subject: [PATCH 2/3] Enforce a minimum PHP version of 5.4.0 on install and upgrade. --- install_minimal/include/AirtimeInstall.php | 10 ++++++++++ install_minimal/include/airtime-install.php | 6 ++++++ install_minimal/include/airtime-upgrade.php | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php index caf538409..0e0a05b4c 100644 --- a/install_minimal/include/AirtimeInstall.php +++ b/install_minimal/include/AirtimeInstall.php @@ -529,4 +529,14 @@ class AirtimeInstall } return $opts; } + + public static function checkPHPVersion() + { + if (PHP_VERSION_ID < 50400) + { + echo "Error: Airtime requires PHP 5.4 or greater."; + return false; + } + return true; + } } diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index ec7829269..a3b3090b6 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -12,6 +12,12 @@ require_once(__DIR__.'/airtime-constants.php'); // The only way we get here is if we are doing a new install or a reinstall. // ------------------------------------------------------------------------- +//Enforce a minimum PHP version +if (!AirtimeInstall::checkPHPVersion()) +{ + exit(1); +} + $iniExists = file_exists("/etc/airtime/airtime.conf"); if ($iniExists) { //reinstall, Will ask if we should rewrite config files. diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php index a8e7a3a22..633312acd 100644 --- a/install_minimal/include/airtime-upgrade.php +++ b/install_minimal/include/airtime-upgrade.php @@ -34,6 +34,12 @@ $con = Propel::getConnection(); $version = AirtimeInstall::GetVersionInstalled(); +//Enforce a minimum PHP version +if (!AirtimeInstall::checkPHPVersion()) +{ + exit(1); +} + echo "******************************** Upgrade Begin *********************************".PHP_EOL; $CC_CONFIG = Config::getConfig(); From 112d592c0c9db72f6bd53458096c06a36d78ac24 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 18 Nov 2013 13:22:57 -0500 Subject: [PATCH 3/3] Delete freenode.txt --- freenode.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 freenode.txt diff --git a/freenode.txt b/freenode.txt deleted file mode 100644 index 144b03df4..000000000 --- a/freenode.txt +++ /dev/null @@ -1 +0,0 @@ -RtGxyZuE