eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Avoid or suppress E_NOTICE and E_WARNING messages related to the checklibs checks.

Browse Source 
* notice on main installer form checking for $_GET['checklibs']
* notices when seeing which module checks to run
* warnings when attempting to load include files
This commit is contained in:
Brion Vibber 2009-09-13 18:15:49 -07:00 committed by Craig Andrews
parent fe9473ac78
commit c93072ed86
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
install.php
View File

@ -189,9 +189,9 @@ function main()
return; return;
} }
if( $_GET['checklibs'] ){ if (isset($_GET['checklibs'])) {
showLibs(); showLibs();
}else{ } else {
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
handlePost(); handlePost();
} else { } else {
@ -202,7 +202,7 @@ function main()
function haveExternalLibrary($external_library) function haveExternalLibrary($external_library)
{ {
if(isset($external_library['include']) && ! include_once($external_library['include'])){ if(isset($external_library['include']) && ! haveIncludeFile($external_library['include'])){
return false; return false;
} }
if(isset($external_library['check_function']) && ! function_exists($external_library['check_function'])){ if(isset($external_library['check_function']) && ! function_exists($external_library['check_function'])){
@ -214,6 +214,15 @@ function haveExternalLibrary($external_library)
return true; return true;
} }
// Attempt to include a PHP file and report if it worked, while
// suppressing the annoying warning messages on failure.
function haveIncludeFile($filename) {
$old = error_reporting(error_reporting() & ~E_WARNING);
$ok = include_once($filename);
error_reporting($old);
return $ok;
}
function checkPrereqs() function checkPrereqs()
{ {
$pass = true; $pass = true;
@ -308,19 +317,19 @@ E_O_T;
foreach($absent_libraries as $library) foreach($absent_libraries as $library)
{ {
echo '<li>'; echo '<li>';
if($library['url']){ if(isset($library['url'])){
echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>'; echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
}else{ }else{
echo htmlentities($library['name']); echo htmlentities($library['name']);
} }
echo '<ul>'; echo '<ul>';
if($library['deb']){ if(isset($library['deb'])){
echo '<li class="deb package">deb: <a href="apt:' . urlencode($library['deb']) . '">' . htmlentities($library['deb']) . '</a></li>'; echo '<li class="deb package">deb: <a href="apt:' . urlencode($library['deb']) . '">' . htmlentities($library['deb']) . '</a></li>';
} }
if($library['rpm']){ if(isset($library['rpm'])){
echo '<li class="rpm package">rpm: ' . htmlentities($library['rpm']) . '</li>'; echo '<li class="rpm package">rpm: ' . htmlentities($library['rpm']) . '</li>';
} }
if($library['pear']){ if(isset($library['pear'])){
echo '<li class="pear package">pear: ' . htmlentities($library['pear']) . '</li>'; echo '<li class="pear package">pear: ' . htmlentities($library['pear']) . '</li>';
} }
echo '</ul>'; echo '</ul>';
@ -333,7 +342,7 @@ E_O_T;
foreach($present_libraries as $library) foreach($present_libraries as $library)
{ {
echo '<li>'; echo '<li>';
if($library['url']){ if(isset($library['url'])){
echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>'; echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
}else{ }else{
echo htmlentities($library['name']); echo htmlentities($library['name']);