From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 30 Apr 2014 17:17:38 +0000 (+0200)
Subject: do not run setupcheck on every page load
X-Git-Tag: v0.4.0~55
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/3e89794cd18eec5b921aa72471a6890fdf40846e?hp=8b450bb3ff801df8ac5522870325eb46543d2cd2

do not run setupcheck on every page load
---

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'];