aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2014-02-28 14:54:50 +0100
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2014-02-28 14:54:50 +0100
commit2bb207d005850263ee4cc227d7b4ad147d6291e2 (patch)
tree015035732cf5d595d93f8e82a2706344b4be178f
parentd4293058364f6f13a7ce55373924b0a563918db0 (diff)
downloadwallabag-2bb207d005850263ee4cc227d7b4ad147d6291e2.tar.gz
wallabag-2bb207d005850263ee4cc227d7b4ad147d6291e2.tar.zst
wallabag-2bb207d005850263ee4cc227d7b4ad147d6291e2.zip
[fix] #483 pdo_sqlite not required if we want mysql / pgsql
-rw-r--r--check_setup.php10
-rw-r--r--install/index.php31
2 files changed, 29 insertions, 12 deletions
diff --git a/check_setup.php b/check_setup.php
index 96dd0f7d..2b84a744 100644
--- a/check_setup.php
+++ b/check_setup.php
@@ -13,16 +13,6 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) {
13 } 13 }
14} 14}
15 15
16// Check PDO Sqlite
17if (! extension_loaded('pdo_sqlite')) {
18 die('PHP extension required: pdo_sqlite');
19}
20
21// Check ZIP
22if (! extension_loaded('zip')) {
23 die('PHP extension required: zip');
24}
25
26// Check if /cache is writeable 16// Check if /cache is writeable
27if (! is_writable('cache')) { 17if (! is_writable('cache')) {
28 die('The directory "cache" must be writeable by your web server user'); 18 die('The directory "cache" must be writeable by your web server user');
diff --git a/install/index.php b/install/index.php
index 975b997f..b21cec52 100644
--- a/install/index.php
+++ b/install/index.php
@@ -225,7 +225,11 @@ php composer.phar install</code></pre></li>
225 <p> 225 <p>
226 Database engine: 226 Database engine:
227 <ul> 227 <ul>
228 <li><label for="sqlite">SQLite</label> <input name="db_engine" type="radio" checked="" id="sqlite" value="sqlite" /></li> 228 <li><label for="sqlite">SQLite</label> <input name="db_engine" type="radio" checked="" id="sqlite" value="sqlite" />
229 <div id="pdo_sqlite" class='messages error install'>
230 <p>You have to enable <a href="http://php.net/manual/ref.pdo-sqlite.php">pdo_sqlite extension</a>.</p>
231 </div>
232 </li>
229 <li> 233 <li>
230 <label for="mysql">MySQL</label> <input name="db_engine" type="radio" id="mysql" value="mysql" /> 234 <label for="mysql">MySQL</label> <input name="db_engine" type="radio" id="mysql" value="mysql" />
231 <ul id="mysql_infos"> 235 <ul id="mysql_infos">
@@ -263,26 +267,49 @@ php composer.phar install</code></pre></li>
263 </p> 267 </p>
264 </fieldset> 268 </fieldset>
265 269
266 <input type="submit" value="Install wallabag" name="install" /> 270 <input type="submit" id="install_button" value="Install wallabag" name="install" />
267 </form> 271 </form>
268 </div> 272 </div>
269 <script> 273 <script>
270 $("#mysql_infos").hide(); 274 $("#mysql_infos").hide();
271 $("#pg_infos").hide(); 275 $("#pg_infos").hide();
276
277 <?php
278 if (!extension_loaded('pdo_sqlite')) : ?>
279 $("#install_button").hide();
280 <?php
281 else :
282 ?>
283 $("#pdo_sqlite").hide();
284 <?php
285 endif;
286 ?>
287
272 $("input[name=db_engine]").click(function() 288 $("input[name=db_engine]").click(function()
273 { 289 {
274 if ( $("#mysql").prop('checked')) { 290 if ( $("#mysql").prop('checked')) {
275 $("#mysql_infos").show(); 291 $("#mysql_infos").show();
276 $("#pg_infos").hide(); 292 $("#pg_infos").hide();
293 $("#pdo_sqlite").hide();
294 $("#install_button").show();
277 } 295 }
278 else { 296 else {
279 if ( $("#postgresql").prop('checked')) { 297 if ( $("#postgresql").prop('checked')) {
280 $("#mysql_infos").hide(); 298 $("#mysql_infos").hide();
281 $("#pg_infos").show(); 299 $("#pg_infos").show();
300 $("#pdo_sqlite").hide();
301 $("#install_button").show();
282 } 302 }
283 else { 303 else {
284 $("#mysql_infos").hide(); 304 $("#mysql_infos").hide();
285 $("#pg_infos").hide(); 305 $("#pg_infos").hide();
306 <?php
307 if (!extension_loaded('pdo_sqlite')) : ?>
308 $("#pdo_sqlite").show();
309 $("#install_button").hide();
310 <?php
311 endif;
312 ?>
286 } 313 }
287 } 314 }
288 }); 315 });