Fix error checks

[jirafeau_project.git] / script.php

diff --git a/script.php b/script.php
index 8968aac426fd23f82f8ebcaebb4a2f48d520f771..6fd862685eb269c94f97a5c8e8e1055b30951bef 100755 (executable)
--- a/script.php
+++ b/script.php
@@ -30,19 +30,19 @@ require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
 \r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
 \r

-if (file_exists (JIRAFEAU_ROOT . 'install.php'))\r
-{\r
-    header('Content-Type: text; charset=utf-8');\r
-    echo "Error";\r
-    exit;\r
-}\r
-\r

  global $script_langages;\r
  $script_langages = array ('bash' => 'Bash');\r
 \r
 if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)\r
 {\r
     require (JIRAFEAU_ROOT . 'lib/template/header.php');\r
  global $script_langages;\r
  $script_langages = array ('bash' => 'Bash');\r
 \r
 if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)\r
 {\r
     require (JIRAFEAU_ROOT . 'lib/template/header.php');\r

+    check_errors ();\r
+    if (has_error ())\r
+    {\r
+        show_errors ();\r
+        require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
+        exit;\r
+    }\r

     echo '<div class="info">';\r
     echo '<h2>' . t('Welcome to Jirafeau\'s query interface') . '</h2>';\r
     echo '<p>';\r
     echo '<div class="info">';\r
     echo '<h2>' . t('Welcome to Jirafeau\'s query interface') . '</h2>';\r
     echo '<p>';\r