Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Lucas Bickel 2017-03-02 14:31:51 +01:00
parent 4a7f3ea001
commit 7b04f413a0
3 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
airtime_mvc/application/configs/config-check.php
View File

@ -9,7 +9,6 @@
$phpDependencies = checkPhpDependencies(); $phpDependencies = checkPhpDependencies();
$externalServices = checkExternalServices(); $externalServices = checkExternalServices();
$zend = $phpDependencies["zend"];
$postgres = $phpDependencies["postgres"]; $postgres = $phpDependencies["postgres"];
$database = $externalServices["database"]; $database = $externalServices["database"];
@ -98,24 +97,6 @@ $result = $r1 && $r2;
PHP Dependencies PHP Dependencies
</caption> </caption>
<tbody> <tbody>
<tr class="<?=$zend ? 'success' : 'danger';?>">
<td class="component">
Zend
</td>
<td class="description">
Zend MVC Framework
</td>
<td class="solution <?php if ($zend) {echo 'check';?>">
<?php
} else {
?>">
<b>Ubuntu</b>: try running <code>sudo apt-get install libzend-framework-php</code>
<br/><b>Debian</b>: try running <code>sudo apt-get install zendframework</code>
<?php
}
?>
</td>
</tr>
<tr class="<?=$postgres ? 'success' : 'danger';?>"> <tr class="<?=$postgres ? 'success' : 'danger';?>">
<td class="component"> <td class="component">
Postgres Postgres

19
airtime_mvc/application/views/scripts/systemstatus/index.phtml
View File

@ -6,7 +6,6 @@
/* Airtime Pro /* Airtime Pro
$phpDependencies = checkPhpDependencies(); $phpDependencies = checkPhpDependencies();
$externalServices = checkExternalServices(); $externalServices = checkExternalServices();
$zend = $phpDependencies["zend"];
$postgres = $phpDependencies["postgres"]; $postgres = $phpDependencies["postgres"];
$database = $externalServices["database"]; $database = $externalServices["database"];
@ -45,24 +44,6 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
--> -->
<tr>
<td class="component">
Zend
</td>
<td class="description">
Zend MVC Framework
</td>
<td class="solution <?php if ($zend) {echo 'check';?>">
<?php
} else {
?>">
<b>Ubuntu</b>: try running <code>sudo apt-get install libzend-framework-php</code>
<br/><b>Debian</b>: try running <code>sudo apt-get install zendframework</code>
<?php
}
?>
</td>
</tr>
<tr> <tr>
<td class="component"> <td class="component">
Postgres Postgres

11
airtime_mvc/build/airtime-setup/load.php
View File

@ -26,21 +26,10 @@ function checkConfiguration() {
*/ */
function checkPhpDependencies() { function checkPhpDependencies() {
return array( return array(
"zend" => checkZendDependencies(),
"postgres" => checkDatabaseDependencies() "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 * Check that the PHP dependencies for the database exist
* *