X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Finstall_functions.php;h=a3bf366195ecf34af6c18204277fe4ac004f17ed;hb=4b77a62f2af5e3804b13159f44641e584825cdb1;hp=3b465851af7f7652de4731453c0635a79ee59002;hpb=b65d65be3121f29009c5dd985f4d2662e4f20c52;p=github%2Fwallabag%2Fwallabag.git

diff --git a/install/install_functions.php b/install/install_functions.php
index 3b465851..a3bf3661 100644
--- a/install/install_functions.php
+++ b/install/install_functions.php
@@ -26,7 +26,11 @@ $allow_url_fopen_ok = (bool)ini_get('allow_url_fopen');
 $filter_ok = extension_loaded('filter');
 $gettext_ok = function_exists("gettext");
 $gd_ok = extension_loaded('gd');
-$pdo_drivers_passing = extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql');
+$pdo_drivers = pdoDrivers();
+$pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres'];
+$urlfetching = $curl_ok || $allow_url_fopen_ok;
+
+
 
 if (extension_loaded('xmlreader')) {
 	$xml_ok = true;
@@ -39,7 +43,11 @@ if (extension_loaded('xmlreader')) {
 	$xml_ok = false;
 }
 
-$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);
+$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, 'urlfetching' => $urlfetching);
 
 return $status;
 }
@@ -49,22 +57,39 @@ function isOkay() {
 
 function isPassing() {
 	$status = status();
-	unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter']);
+	unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter'], $status['allow_url_fopen']);
 	return !in_array(false, $status);
 }
 
+function pdoDrivers() {
+    $pdo_driver_sqlite = extension_loaded('pdo_sqlite');
+    $pdo_driver_mysql = extension_loaded('pdo_mysql');
+    $pdo_driver_postgres = extension_loaded('pdo_pgsql');
+
+    $pdo_drivers = array('sqlite' => $pdo_driver_sqlite, 'mysql' => $pdo_driver_mysql,
+        'postgres' => $pdo_driver_postgres);
+
+    return $pdo_drivers;
+}
+
 /* 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");
+function delTree($dir, $withdirectory=true, $hiddenfiles = true) {
+    if ($hiddenfiles) {
+        $files = array_diff(scandir($dir), array('.','..'));
+        foreach ($files as $file) {
+            (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
+        }
+    }
+    if ($withdirectory) {
+        return rmdir($dir);
+    } else {
+        return true;
     }
-    return rmdir($dir);
   }
 
 function generate_salt() {
@@ -85,4 +110,4 @@ function executeQuery($handle, $sql, $params) {
     }
 }
 
-?>
\ No newline at end of file
+?>