aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2014-04-30 19:17:38 +0200
committerChristian Weiske <cweiske@cweiske.de>2014-04-30 19:17:38 +0200
commit3e89794cd18eec5b921aa72471a6890fdf40846e (patch)
treefb517bada70102a4a98d43627a67b6d34495cbe4
parent8b450bb3ff801df8ac5522870325eb46543d2cd2 (diff)
downloadphorkie-3e89794cd18eec5b921aa72471a6890fdf40846e.tar.gz
phorkie-3e89794cd18eec5b921aa72471a6890fdf40846e.zip
do not run setupcheck on every page load
-rw-r--r--README.rst8
-rw-r--r--www/setup.php2
-rw-r--r--www/www-header.php3
3 files changed, 9 insertions, 4 deletions
diff --git a/README.rst b/README.rst
index 07babec..c53d497 100644
--- a/README.rst
+++ b/README.rst
@@ -69,7 +69,10 @@ Installation
must also set the ``RewriteBase`` in the ``.htaccess`` file or adjust
the nginx configuration accordingly.
-6. Open phorkie in your web browser
+6. Open http://yourhost/setup in your web browser to see if everything
+ is working fine.
+
+7. Go to http://yourhost/
Dependencies
@@ -104,6 +107,9 @@ on your machine:
$ pear channel-discover pear.michelf.ca
$ pear install michelf/Markdown
+ $ pear channel-discover pear2.php.net
+ $ pear install pear2/services_linkback-alpha
+
Note that this version of GeSHi is a bit outdated, but it's the fastest
way to install it.
If you install it manually be sure to update the
diff --git a/www/setup.php b/www/setup.php
index b042339..d62efe0 100644
--- a/www/setup.php
+++ b/www/setup.php
@@ -13,6 +13,8 @@ if (!$GLOBALS['phorkie']['cfg']['setupcheck']) {
exit(1);
}
+SetupCheck::run();
+
header('Content-type: text/plain');
echo "All fine\n";
?>
diff --git a/www/www-header.php b/www/www-header.php
index d763742..c99f8c8 100644
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -46,9 +46,6 @@ require_once __DIR__ . '/../data/config.default.php';
if (file_exists(__DIR__ . '/../data/config.php')) {
require_once __DIR__ . '/../data/config.php';
}
-if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
- SetupCheck::run();
-}
// Set/Get git commit session variables
$_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR'];