mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-01 13:31:04 +00:00
Code Issues Projects Releases Wiki Activity

fix #1078

Browse source
This commit is contained in:
Thomas Citharel 2015-02-13 17:13:11 +01:00
parent d7d88631e1
commit af13787e74
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
install/index.php
View file

@ -522,8 +522,16 @@ border: 1px solid #000;
<tr class="<?php echo ($status['allow_url_fopen']) ? 'enabled' : 'disabled'; ?>">
<td><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></td>
<td>Enabled</td>
<?php echo ($status['allow_url_fopen']) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
<td><?php echo ($status['allow_url_fopen']) ? '<strong>allow_url_fopen:</strong> You have allow_url_fopen enabled.' : '<strong>allow_url_fopen:</strong> Your PHP configuration has allow_url_fopen disabled. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td>
<?php if ($status['allow_url_fopen']) { ?>
<td class="good">Enabled</td>
<td><strong>allow_url_fopen:</strong> You have allow_url_fopen enabled.
<?php } elseif ($status['curl']) { ?>
<td class="pass">Disabled</td>
<td><strong>allow_url_fopen</strong> is disabled, but curl is supported, so it should be ok.</td>
<?php } else { ?>
<td class="bad">Disabled</td>
<td><strong>allow_url_fopen:</strong> Your PHP configuration has allow_url_fopen disabled.
<strong><?php echo $status['app_name']; ?> will not work here.</strong><?php } ?></td>
</tr>
<tr class="<?php echo ($status['gettext']) ? 'enabled' : 'disabled'; ?>">
<td><a href="http://php.net/manual/en/book.gettext.php">gettext</a></td>

5
install/install_functions.php
View file

@ -28,6 +28,7 @@ $gettext_ok = function_exists("gettext");
$gd_ok = extension_loaded('gd');
$pdo_drivers = pdoDrivers();
$pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres'];
$urlfetching = $curl_ok || $allow_url_fopen_ok;
@ -46,7 +47,7 @@ $status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok,
'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok,
'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok,
'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok,
'gettext' => $gettext_ok, 'gd' => $gd_ok);
'gettext' => $gettext_ok, 'gd' => $gd_ok, 'urlfetching' => $urlfetching);
return $status;
}
@ -56,7 +57,7 @@ function isOkay() {
function isPassing() {
$status = status();
unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter']);
unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter'], $status['allow_url_fopen']);
return !in_array(false, $status);
}