aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-01-31 23:35:45 +0100
committerThomas Citharel <tcit@tcit.fr>2015-01-31 23:35:45 +0100
commit22f19b23a6e9400b5776a9a7f0eedb9eb1b5362e (patch)
tree58ee661c15af6371fadd33ce5f5c24f6b0209ec3
parentca056e7fd1e2bcc8390aabdc6b4fcb84aeb0d302 (diff)
downloadwallabag-22f19b23a6e9400b5776a9a7f0eedb9eb1b5362e.tar.gz
wallabag-22f19b23a6e9400b5776a9a7f0eedb9eb1b5362e.tar.zst
wallabag-22f19b23a6e9400b5776a9a7f0eedb9eb1b5362e.zip
view improvements & check if at least one pdo driver is available
-rwxr-xr-xinstall/index.php60
-rw-r--r--install/wallabag_compatibility_test.php3
2 files changed, 46 insertions, 17 deletions
diff --git a/install/index.php b/install/index.php
index 77b83c36..54f7f7f2 100755
--- a/install/index.php
+++ b/install/index.php
@@ -275,6 +275,27 @@ background-color:#FF9500;
275.detail { 275.detail {
276cursor: pointer; 276cursor: pointer;
277} 277}
278.compatibity_result {
279 margin: auto;
280 max-width: 300px;
281 min-height: 50px;
282 line-height: 50px;
283 text-align: center;
284}
285
286h2, legend {
287 font-size: 30px;
288 text-transform: uppercase;
289 font-family: "PT Sans",sans-serif;
290}
291
292legend:after {
293 content: "";
294 height: 4px;
295 width: 70px;
296 background-color: #000;
297 display: block;
298}
278 299
279</style> 300</style>
280 301
@@ -328,14 +349,16 @@ cursor: pointer;
328 <p>To install wallabag, you just have to fill the following fields. That's all.</p> 349 <p>To install wallabag, you just have to fill the following fields. That's all.</p>
329 <p>If you need help, you can read the doc: <a href="docs/" target="_blank">offline documentation</a> and <a href="http://doc.wallabag.org" target="_blank">online one</a> (already up-to-date).</p> 350 <p>If you need help, you can read the doc: <a href="docs/" target="_blank">offline documentation</a> and <a href="http://doc.wallabag.org" target="_blank">online one</a> (already up-to-date).</p>
330 351
331 <p class="detail">Server compatibility test (click to view details) : <?php if (isOkay()) { ?> 352 <div>
332 <span class="good">All good</span> 353 <h2>Server compatibility test</h2>
333 <?php } elseif (isPassing()) { ?> 354 <?php if (isOkay()) { ?>
334 <span class="pass">Some problems, but it's OK !</span> 355 <div class="compatibity_result detail good">All good</div>
335 <?php } else { ?> 356 <?php } elseif (isPassing()) { ?>
336 <span class="bad">Bad news : you can't run wallabag</span> 357 <div class="compatibity_result detail pass">Some problems, but it's OK !</div>
337 <?php } ?> </p> 358 <?php } else { ?>
338 <?php $status = status(); ?> 359 <div class="compatibity_result detail bad">Bad news : you can't run wallabag</div>
360 <?php } $status = status(); ?>
361 </div>
339 362
340 <div class="details"> 363 <div class="details">
341 <div> 364 <div>
@@ -363,6 +386,12 @@ cursor: pointer;
363 <?php echo ($status['pdo']) ? '<td class="good">Enabled</span>' : '<td class="bad">Disabled'; ?></td> 386 <?php echo ($status['pdo']) ? '<td class="good">Enabled</span>' : '<td class="bad">Disabled'; ?></td>
364 <td><?php echo ($status['pdo']) ? '<strong>PDO:</strong> You have PDO support enabled.' : '<strong>PDO:</strong> Your PHP installation doesn\'t support PHP PDO. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td> 387 <td><?php echo ($status['pdo']) ? '<strong>PDO:</strong> You have PDO support enabled.' : '<strong>PDO:</strong> Your PHP installation doesn\'t support PHP PDO. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td>
365 </tr> 388 </tr>
389 <tr class="<?php echo ($status['pdo_drivers_passing']) ? 'enabled' : 'disabled'; ?>">
390 <td>PDO Drivers</td>
391 <td>One of the PDO drivers must be installed</td>
392 <?php echo ($status['pdo_drivers_passing']) ? '<td class="good">One driver is enabled</span>' : '<td class="bad">No driver available'; ?></td>
393 <td><?php echo ($status['pdo_drivers_passing']) ? '<strong>PDO:</strong> You have at least one PDO driver installed.' : '<strong>PDO Drivers:</strong> Your PHP installation doesn\'t have any PDO driver installed. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td>
394 </tr>
366 <tr class="<?php echo ($status['xml']) ? 'enabled' : 'disabled'; ?>"> 395 <tr class="<?php echo ($status['xml']) ? 'enabled' : 'disabled'; ?>">
367 <td><a href="http://php.net/xml">XML</a></td> 396 <td><a href="http://php.net/xml">XML</a></td>
368 <td>Enabled</td> 397 <td>Enabled</td>
@@ -453,8 +482,8 @@ cursor: pointer;
453 </tr> 482 </tr>
454 </tbody> 483 </tbody>
455 </table> 484 </table>
485 <hr>
456 </div> 486 </div>
457 <hr>
458 <div class="details"> 487 <div class="details">
459 <?php //if ($status['php'] && $status['xml'] && $status['pcre'] && $status['mbstring'] && $status['iconv'] && $status['filter'] && $status['allow_url_fopen']) { ?> 488 <?php //if ($status['php'] && $status['xml'] && $status['pcre'] && $status['mbstring'] && $status['iconv'] && $status['filter'] && $status['allow_url_fopen']) { ?>
460 <?php if (isOkay()) { ?> 489 <?php if (isOkay()) { ?>
@@ -472,12 +501,11 @@ cursor: pointer;
472 <?php } ?> 501 <?php } ?>
473 </div> 502 </div>
474 503
475 <div class="chunk"> 504 <div class="chunk">
476 <p class="footnote">This compatibility test has been borrowed (and slightly adapted by <a href="http://fivefilters.org/content-only/">fivefilters.org</a>) from the one supplied by <a href="http://simplepie.org/">SimplePie.org</a>.</a></p> 505 <p class="footnote">This compatibility test has been borrowed (and slightly adapted by <a href="http://fivefilters.org/content-only/">fivefilters.org</a>) from the one supplied by <a href="http://simplepie.org/">SimplePie.org</a>.</a></p>
506 </div>
507 <hr>
477 </div> 508 </div>
478
479 </div>
480 <hr>
481 <form method="post" class="technical"> 509 <form method="post" class="technical">
482 <?php if (!is_dir('vendor')) : ?> 510 <?php if (!is_dir('vendor')) : ?>
483 <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:<br /> 511 <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:<br />
@@ -488,13 +516,13 @@ cursor: pointer;
488 <b>Be careful, zip extension is not enabled in your PHP configuration. You'll have to unzip vendor.zip manually.</b> 516 <b>Be careful, zip extension is not enabled in your PHP configuration. You'll have to unzip vendor.zip manually.</b>
489 <?php endif; ?> 517 <?php endif; ?>
490 <em>This method is mainly recommended if you don't have a dedicated server.</em></li> 518 <em>This method is mainly recommended if you don't have a dedicated server.</em></li>
491 <li>use <a href="http://getcomposer.org/">Composer</a> :<pre><code>curl -s http://getcomposer.org/installer | php 519 <li>use <a href="http://getcomposer.org/">Composer</a> in your wallabag folder :<pre><code>curl -s http://getcomposer.org/installer | php
492php composer.phar install</code></pre></li> 520php composer.phar install</code></pre></li>
493 </ul> 521 </ul>
494 </div> 522 </div>
495 <?php endif; ?> 523 <?php endif; ?>
496 <fieldset> 524 <fieldset>
497 <legend><strong>Technical settings</strong></legend> 525 <legend><strong>Database settings</strong></legend>
498 <p> 526 <p>
499 Database engine: 527 Database engine:
500 <ul> 528 <ul>
diff --git a/install/wallabag_compatibility_test.php b/install/wallabag_compatibility_test.php
index 1093b2a3..3b465851 100644
--- a/install/wallabag_compatibility_test.php
+++ b/install/wallabag_compatibility_test.php
@@ -26,6 +26,7 @@ $allow_url_fopen_ok = (bool)ini_get('allow_url_fopen');
26$filter_ok = extension_loaded('filter'); 26$filter_ok = extension_loaded('filter');
27$gettext_ok = function_exists("gettext"); 27$gettext_ok = function_exists("gettext");
28$gd_ok = extension_loaded('gd'); 28$gd_ok = extension_loaded('gd');
29$pdo_drivers_passing = extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql');
29 30
30if (extension_loaded('xmlreader')) { 31if (extension_loaded('xmlreader')) {
31 $xml_ok = true; 32 $xml_ok = true;
@@ -38,7 +39,7 @@ if (extension_loaded('xmlreader')) {
38 $xml_ok = false; 39 $xml_ok = false;
39} 40}
40 41
41$status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok, '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); 42$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);
42 43
43return $status; 44return $status;
44} 45}