do not run setupcheck on every page load

diff --git a/README.rst b/README.rst
index 07babecfb89cde1b3125df65f816f40bba1ff72d..c53d497198c04356a363075059b547b117faf442 100644 (file)
--- 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.
 
    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
 
 
 Dependencies


@@ -104,6 +107,9 @@ on your machine:
   $ pear channel-discover pear.michelf.ca
   $ pear install michelf/Markdown
 
   $ 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
 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 b0423392e064d768601c7c9b433dc8f2bcf8f2f0..d62efe0d3918f945bafab037369de75394d8daf8 100644 (file)
--- a/www/setup.php
+++ b/www/setup.php
@@ -13,6 +13,8 @@ if (!$GLOBALS['phorkie']['cfg']['setupcheck']) {
     exit(1);
 }
 
     exit(1);
 }
 

+SetupCheck::run();
+

 header('Content-type: text/plain');
 echo "All fine\n";
 ?>
 header('Content-type: text/plain');
 echo "All fine\n";
 ?>

diff --git a/www/www-header.php b/www/www-header.php
index d76374212b3c5fb879e32dece99430a1919be4ef..c99f8c8ed774b54610ced1f97d7df067612b6d28 100644 (file)
--- 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 (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'];
 
 // Set/Get git commit session variables
 $_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR'];