summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-03-26 22:38:05 +0400
committerAndrew Dolgov <[email protected]>2013-03-26 22:38:05 +0400
commitd0c6dd29d19da4de9966cd9985d467fe1cfab556 (patch)
tree8c312e884dfbb6d89875ddf02303ae9b7d358d7b /include
parent24df74de3b8d60e50fec9220a34869fd51480c63 (diff)
add experimental easy installer
Diffstat (limited to 'include')
-rw-r--r--include/db.php2
-rw-r--r--include/sanity_check.php4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/db.php b/include/db.php
index 0479df6a9..a70a1d878 100644
--- a/include/db.php
+++ b/include/db.php
@@ -15,7 +15,7 @@ function db_connect($host, $user, $pass, $db) {
$string .= " host=$host";
}
- if (defined('DB_PORT')) {
+ if (defined('DB_PORT') && DB_PORT) {
$string = "$string port=" . DB_PORT;
}
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 0373196b3..f428550fd 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -12,6 +12,10 @@
require_once "sanity_config.php";
+ if (file_exists("install") && !file_exists("config.php")) {
+ array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
+ }
+
if (strpos(PLUGINS, "auth_") === FALSE) {
array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
}