moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 11:22:17 -05:00
Code Issues Releases Wiki Activity

Improvements to install script

Browse Source 
* automatically remove install/ folder
* go easier though the compatibility test <-> install script pages
* Small fixes which raised php warnings
This commit is contained in:
tcit 2014-03-28 20:00:02 +01:00
parent ad697686c0
commit fecb62a396
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
install/index.php
View File

@ -1,7 +1,28 @@
<?php <?php
$errors = array(); $errors = array();
$successes = array(); $successes = array();
if ($_POST['download']) {
/* Function taken from at http://php.net/manual/en/function.rmdir.php#110489
* Idea : nbari at dalmp dot com
* Rights unknown
* Here in case of .gitignore files
*/
function delTree($dir) {
$files = array_diff(scandir($dir), array('.','..'));
foreach ($files as $file) {
(is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
}
return rmdir($dir);
}
if (isset($_GET['clean'])) {
if (is_dir('install')){
delTree('install');
header('Location: index.php');
}
}
if (isset($_POST['download'])) {
if (!file_put_contents("cache/vendor.zip", fopen("http://static.wallabag.org/files/vendor.zip", 'r'))) { if (!file_put_contents("cache/vendor.zip", fopen("http://static.wallabag.org/files/vendor.zip", 'r'))) {
$errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually<∕a> and unzip it in your wallabag folder.'; $errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually<∕a> and unzip it in your wallabag folder.';
} }
@ -25,7 +46,7 @@ if ($_POST['download']) {
} }
} }
} }
else if ($_POST['install']) { else if (isset($_POST['install'])) {
if (!is_dir('vendor')) { if (!is_dir('vendor')) {
$errors[] = 'You must install twig before.'; $errors[] = 'You must install twig before.';
} }
@ -64,6 +85,7 @@ else if ($_POST['install']) {
else { else {
$db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite'; $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite';
$handle = new PDO($db_path); $handle = new PDO($db_path);
$sql_structure = "";
} }
} }
else { else {
@ -129,7 +151,7 @@ else if ($_POST['install']) {
$params = array($id_user, 'language', 'en_EN.UTF8'); $params = array($id_user, 'language', 'en_EN.UTF8');
$query = executeQuery($handle, $sql, $params); $query = executeQuery($handle, $sql, $params);
$successes[] = 'wallabag is now installed. Don\'t forget to delete install folder. Then, <a href="index.php">reload this page</a>.'; $successes[] = 'wallabag is now installed. You can now <a href="index.php?clean=0">access it !</a>';
} }
} }
} }
@ -198,18 +220,18 @@ else if ($_POST['install']) {
<?php if (file_exists('inc/poche/config.inc.php') && is_dir('vendor')) : ?> <?php if (file_exists('inc/poche/config.inc.php') && is_dir('vendor')) : ?>
<div class='messages success install'> <div class='messages success install'>
<p> <p>
wallabag seems already installed. If you want to update it, you only have to delete install folder. wallabag seems already installed. If you want to update it, you only have to delete install folder, then <a href="index.php">reload this page</a>.
</p> </p>
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<p>To install wallabag, you just have to fill the following fields. That's all.</p> <p>To install wallabag, you just have to fill the following fields. That's all.</p>
<p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php">here</a>.</p> <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php?from=install">here</a>.</p>
<form method="post"> <form method="post">
<fieldset> <fieldset>
<legend><strong>Technical settings</strong></legend> <legend><strong>Technical settings</strong></legend>
<?php if (!is_dir('vendor')) : ?> <?php if (!is_dir('vendor')) : ?>
<div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:<br />
<ul> <ul>
<li>automatically download and extract vendor.zip into your wallabag folder. <li>automatically download and extract vendor.zip into your wallabag folder.
<p><input type="submit" name="download" value="Download vendor.zip" /></p> <p><input type="submit" name="download" value="Download vendor.zip" /></p>
@ -245,7 +267,7 @@ php composer.phar install</code></pre></li>
<li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li> <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li>
<li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li> <li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li>
<li><label for="pg_user">User</label> <input type="text" placeholder="user" id="pg_user" name="pg_user" /></li> <li><label for="pg_user">User</label> <input type="text" placeholder="user" id="pg_user" name="pg_user" /></li>
id <li><label for="pg_password">Password</label> <input type="text" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li> <li><label for="pg_password">Password</label> <input type="text" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li>
</ul> </ul>
</li> </li>
</ul> </ul>

20
wallabag_compatibility_test.php
View File

@ -171,7 +171,13 @@ background-color:#FF9500;
</head> </head>
<body> <body>
<?php
$frominstall = false;
if (isset($_GET['from'])){
if ($_GET['from'] == 'install'){
$frominstall = true;
}}
?>
<div id="site"> <div id="site">
<div id="content"> <div id="content">
@ -337,15 +343,23 @@ background-color:#FF9500;
<?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok && $gettext_ok) { ?> <?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok && $gettext_ok) { ?>
<h3>Bottom Line: Yes, you can!</h3> <h3>Bottom Line: Yes, you can!</h3>
<p><em>Your webhost has its act together!</em></p> <p><em>Your webhost has its act together!</em></p>
<?php if (!$frominstall) { ?>
<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p> <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
<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> <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>
<?php } else { ?>
<p>You can now <a href="index.php">return to the installation section</a>.</p>
<?php } ?>
<p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p> <p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p>
<?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?> <?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?>
<?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok && $gettext_ok) { ?> <?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok && $gettext_ok) { ?>
<h3>Bottom Line: Yes, you can!</h3> <h3>Bottom Line: Yes, you can!</h3>
<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> <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>
<?php if (!$frominstall) { ?>
<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p> <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
<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> <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>
<?php } else { ?>
<p>You can now <a href="index.php">return to the installation section</a>.</p>
<?php } ?>
<p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p> <p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p>
<?php } else { ?> <?php } else { ?>
<h3>Bottom Line: We're sorry…</h3> <h3>Bottom Line: We're sorry…</h3>