diff options
| author | tcit <tcit@tcit.fr> | 2014-03-28 20:00:02 +0100 |
|---|---|---|
| committer | tcit <tcit@tcit.fr> | 2014-03-28 20:00:02 +0100 |
| commit | fecb62a3967eefda9880ce37e13693713385a093 (patch) | |
| tree | 539cd02f04ff9ee5b06ff228130ac206b5844a89 /wallabag_compatibility_test.php | |
| parent | ad697686c00432964528226588a8cbea909c9e36 (diff) | |
| download | wallabag-fecb62a3967eefda9880ce37e13693713385a093.tar.gz wallabag-fecb62a3967eefda9880ce37e13693713385a093.tar.zst wallabag-fecb62a3967eefda9880ce37e13693713385a093.zip | |
Improvements to install script
* automatically remove install/ folder
* go easier though the compatibility test <-> install script pages
* Small fixes which raised php warnings
Diffstat (limited to 'wallabag_compatibility_test.php')
| -rw-r--r-- | wallabag_compatibility_test.php | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/wallabag_compatibility_test.php b/wallabag_compatibility_test.php index 51ea31e1..7a52767c 100644 --- a/wallabag_compatibility_test.php +++ b/wallabag_compatibility_test.php | |||
| @@ -171,7 +171,13 @@ background-color:#FF9500; | |||
| 171 | </head> | 171 | </head> |
| 172 | 172 | ||
| 173 | <body> | 173 | <body> |
| 174 | 174 | <?php | |
| 175 | $frominstall = false; | ||
| 176 | if (isset($_GET['from'])){ | ||
| 177 | if ($_GET['from'] == 'install'){ | ||
| 178 | $frominstall = true; | ||
| 179 | }} | ||
| 180 | ?> | ||
| 175 | <div id="site"> | 181 | <div id="site"> |
| 176 | <div id="content"> | 182 | <div id="content"> |
| 177 | 183 | ||
| @@ -337,15 +343,23 @@ background-color:#FF9500; | |||
| 337 | <?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok && $gettext_ok) { ?> | 343 | <?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok && $gettext_ok) { ?> |
| 338 | <h3>Bottom Line: Yes, you can!</h3> | 344 | <h3>Bottom Line: Yes, you can!</h3> |
| 339 | <p><em>Your webhost has its act together!</em></p> | 345 | <p><em>Your webhost has its act together!</em></p> |
| 346 | <?php if (!$frominstall) { ?> | ||
| 340 | <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p> | 347 | <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p> |
| 341 | <p>If you already have done that, you should access <a href="index.php">the index.php file</a> of your installation to configure and start using wallabag</p> | 348 | <p>If you already have done that, you should access <a href="index.php">the index.php file</a> of your installation to configure and/or start using wallabag</p> |
| 349 | <?php } else { ?> | ||
| 350 | <p>You can now <a href="index.php">return to the installation section</a>.</p> | ||
| 351 | <?php } ?> | ||
| 342 | <p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost — it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p> | 352 | <p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost — it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p> |
| 343 | <?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?> | 353 | <?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?> |
| 344 | <?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok && $gettext_ok) { ?> | 354 | <?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok && $gettext_ok) { ?> |
| 345 | <h3>Bottom Line: Yes, you can!</h3> | 355 | <h3>Bottom Line: Yes, you can!</h3> |
| 346 | <p><em>For most feeds, it'll run with no problems.</em> There are certain languages that you might have a hard time with though.</p> | 356 | <p><em>For most feeds, it'll run with no problems.</em> There are certain languages that you might have a hard time with though.</p> |
| 357 | <?php if (!$frominstall) { ?> | ||
| 347 | <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p> | 358 | <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p> |
| 348 | <p>If you already have done that, you should access <a href="index.php">the index.php file</a> of your installation to configure and start using wallabag</p> | 359 | <p>If you already have done that, you should access <a href="index.php">the index.php file</a> of your installation to configure and/or start using wallabag</p> |
| 360 | <?php } else { ?> | ||
| 361 | <p>You can now <a href="index.php">return to the installation section</a>.</p> | ||
| 362 | <?php } ?> | ||
| 349 | <p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost — it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p> | 363 | <p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost — it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p> |
| 350 | <?php } else { ?> | 364 | <?php } else { ?> |
| 351 | <h3>Bottom Line: We're sorry…</h3> | 365 | <h3>Bottom Line: We're sorry…</h3> |