From 7b04f413a0651e40c22c25826d1e4a1057ebd116 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Thu, 2 Mar 2017 14:31:51 +0100 Subject: [PATCH] Remove zend dep check from status and config output It's LibreTime's responsability to ensure this (ie in packages...) and the user should not need to know about this. --- .../application/configs/config-check.php | 19 ------------------- .../views/scripts/systemstatus/index.phtml | 19 ------------------- airtime_mvc/build/airtime-setup/load.php | 11 ----------- 3 files changed, 49 deletions(-) diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php index 5ddf73295..f2b3666e5 100644 --- a/airtime_mvc/application/configs/config-check.php +++ b/airtime_mvc/application/configs/config-check.php @@ -9,7 +9,6 @@ $phpDependencies = checkPhpDependencies(); $externalServices = checkExternalServices(); -$zend = $phpDependencies["zend"]; $postgres = $phpDependencies["postgres"]; $database = $externalServices["database"]; @@ -98,24 +97,6 @@ $result = $r1 && $r2; PHP Dependencies - - - Zend - - - Zend MVC Framework - - - "> - Ubuntu: try running sudo apt-get install libzend-framework-php -
Debian: try running sudo apt-get install zendframework - - - Postgres diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml index d06cd4c1d..76321d8f2 100644 --- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml +++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml @@ -6,7 +6,6 @@ /* Airtime Pro $phpDependencies = checkPhpDependencies(); $externalServices = checkExternalServices(); - $zend = $phpDependencies["zend"]; $postgres = $phpDependencies["postgres"]; $database = $externalServices["database"]; @@ -45,24 +44,6 @@   --> - - - Zend - - - Zend MVC Framework - - - "> - Ubuntu: try running sudo apt-get install libzend-framework-php -
Debian: try running sudo apt-get install zendframework - - - Postgres diff --git a/airtime_mvc/build/airtime-setup/load.php b/airtime_mvc/build/airtime-setup/load.php index 646a284e3..6b2624ce0 100644 --- a/airtime_mvc/build/airtime-setup/load.php +++ b/airtime_mvc/build/airtime-setup/load.php @@ -26,21 +26,10 @@ function checkConfiguration() { */ function checkPhpDependencies() { return array( - "zend" => checkZendDependencies(), "postgres" => checkDatabaseDependencies() ); } -/** - * Check that the Zend framework libraries are installed - * - * @return boolean true if Zend exists in /usr/share/php - */ -function checkZendDependencies() { - return file_exists('/usr/share/php/libzend-framework-php') - || file_exists('/usr/share/php/Zend'); // Debian version -} - /** * Check that the PHP dependencies for the database exist *