aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-13 17:13:11 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-13 17:13:11 +0100
commitaf13787e74ea45d7edc1005810f15a8baa428a77 (patch)
tree5dc3cbea022229e3f720098ba05653279adb14fe
parentd7d88631e125c98cc2e7432c8147afc2ceda3d42 (diff)
downloadwallabag-af13787e74ea45d7edc1005810f15a8baa428a77.tar.gz
wallabag-af13787e74ea45d7edc1005810f15a8baa428a77.tar.zst
wallabag-af13787e74ea45d7edc1005810f15a8baa428a77.zip
fix #1078
-rwxr-xr-xinstall/index.php12
-rw-r--r--install/install_functions.php5
2 files changed, 13 insertions, 4 deletions
diff --git a/install/index.php b/install/index.php
index 0d3977bb..46638f8f 100755
--- a/install/index.php
+++ b/install/index.php
@@ -522,8 +522,16 @@ border: 1px solid #000;
522 <tr class="<?php echo ($status['allow_url_fopen']) ? 'enabled' : 'disabled'; ?>"> 522 <tr class="<?php echo ($status['allow_url_fopen']) ? 'enabled' : 'disabled'; ?>">
523 <td><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></td> 523 <td><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></td>
524 <td>Enabled</td> 524 <td>Enabled</td>
525 <?php echo ($status['allow_url_fopen']) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td> 525 <?php if ($status['allow_url_fopen']) { ?>
526 <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> 526 <td class="good">Enabled</td>
527 <td><strong>allow_url_fopen:</strong> You have allow_url_fopen enabled.
528 <?php } elseif ($status['curl']) { ?>
529 <td class="pass">Disabled</td>
530 <td><strong>allow_url_fopen</strong> is disabled, but curl is supported, so it should be ok.</td>
531 <?php } else { ?>
532 <td class="bad">Disabled</td>
533 <td><strong>allow_url_fopen:</strong> Your PHP configuration has allow_url_fopen disabled.
534 <strong><?php echo $status['app_name']; ?> will not work here.</strong><?php } ?></td>
527 </tr> 535 </tr>
528 <tr class="<?php echo ($status['gettext']) ? 'enabled' : 'disabled'; ?>"> 536 <tr class="<?php echo ($status['gettext']) ? 'enabled' : 'disabled'; ?>">
529 <td><a href="http://php.net/manual/en/book.gettext.php">gettext</a></td> 537 <td><a href="http://php.net/manual/en/book.gettext.php">gettext</a></td>
diff --git a/install/install_functions.php b/install/install_functions.php
index 4a18d7d8..a4830569 100644
--- a/install/install_functions.php
+++ b/install/install_functions.php
@@ -28,6 +28,7 @@ $gettext_ok = function_exists("gettext");
28$gd_ok = extension_loaded('gd'); 28$gd_ok = extension_loaded('gd');
29$pdo_drivers = pdoDrivers(); 29$pdo_drivers = pdoDrivers();
30$pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres']; 30$pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres'];
31$urlfetching = $curl_ok || $allow_url_fopen_ok;
31 32
32 33
33 34
@@ -46,7 +47,7 @@ $status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok,
46 'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok, 47 'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok,
47 'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok, 48 'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok,
48 'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok, 49 'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok,
49 'gettext' => $gettext_ok, 'gd' => $gd_ok); 50 'gettext' => $gettext_ok, 'gd' => $gd_ok, 'urlfetching' => $urlfetching);
50 51
51return $status; 52return $status;
52} 53}
@@ -56,7 +57,7 @@ function isOkay() {
56 57
57function isPassing() { 58function isPassing() {
58 $status = status(); 59 $status = status();
59 unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter']); 60 unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter'], $status['allow_url_fopen']);
60 return !in_array(false, $status); 61 return !in_array(false, $status);
61} 62}
62 63