[FEATURE] Move fatal error method

Move fatal error method to functions lib to use
it in other scripts than install.php as well.

diff --git a/install.php b/install.php
index 9e05b8c449658776eefc501608a029927ff5e742..2739bc8ab7a103202927321a04bed920c40bc1e5 100644 (file)
--- a/install.php
+++ b/install.php
@@ -102,13 +102,6 @@ function jirafeau_add_ending_slash($path)
     return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 
     return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 

-function jirafeau_fatal_error($errorText)
-{
-    echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
-    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
-}
-

 /**
  * Check installation
  **/
 /**
  * Check installation
  **/

diff --git a/lib/functions.php b/lib/functions.php
index 50ab345197cb508416bca35a6507829c3f24ce9a..d844e50627cb749075484056b8da2aebc0b867f8 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -128,6 +128,13 @@ function jirafeau_get_datetimefield($timestamp)
     return $content;
 }
 
     return $content;
 }
 

+function jirafeau_fatal_error($errorText, $cfg = array())
+{
+    echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
+    exit;
+}
+

 function jirafeau_clean_rm_link($link)
 {
     $p = s2p("$link");
 function jirafeau_clean_rm_link($link)
 {
     $p = s2p("$link");

diff --git a/lib/template/footer.php b/lib/template/footer.php
index 9e39858e2ff81bc4ca7652ef915c783cdf0d6e1d..f33373f3f688532467f288352a8ef41ff51c8445 100644 (file)
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -9,7 +9,7 @@
         ?>
         <!-- Installation dependend links -->
         <?php
         ?>
         <!-- Installation dependend links -->
         <?php

-        if (true == $cfg['installation_done']) {
+        if (false === empty($cfg['installation_done'])) {

             echo ' <span>|</span> ';
             echo '<a href="' . JIRAFEAU_ABSPREFIX . 'tos.php">' . t('Terms of Service') . '</a>';
         }
             echo ' <span>|</span> ';
             echo '<a href="' . JIRAFEAU_ABSPREFIX . 'tos.php">' . t('Terms of Service') . '</a>';
         }