From 8792cefc7c1babc73f0fc607a88dc290cf4d022c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Fri, 19 Jul 2002 11:46:42 +0000
Subject: [PATCH] PHP3 fixes and coding standards

---
 ChangeLog                     |  5 ++++-
 libraries/common.lib.php3     | 12 +++++++-----
 tbl_properties_structure.php3 |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a57897b1..25ed1729d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-07-19 Loïc Chapeaux  <lolo@phpheaven.net>
+    * pdf_schema.php3; libraries/common.lib.php3: PHP3 fixes.
+    * tbl_properties_structure.php3: coding standards.
+
 2002-07-18 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3, libraries/select_lang.lib.php3: Don't include
       the "real" config file if a developer edition exists.
@@ -632,7 +636,6 @@ $Source$
     * Documentation.html line 593-770,1884-1920
     - added and changed Doku for Creating PDFs
 
-
 2002-06-02 Loïc Chapeaux  <lolo@phpheaven.net>
     * libraries/display_tbl.inc.php3, line 1413: xhtml fix.
     * libraries/fpdf/fpdf.php3: light optimizations and fixes.
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 7cf7b399f..8172768e7 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -81,10 +81,12 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
      * versions of phpMyAdmin/php/mysql...
      */    
     $old_error_reporting = error_reporting(0);
-    if (!include($cfgfile_to_load)) {
+    include($cfgfile_to_load);
+    // Include failed
+    if (!isset($cfgServers) && !isset($cfg['Servers'])) {
         // Creates fake settings
         $cfg = array('DefaultLang' => 'en');
-        // Loads the laguage file
+        // Loads the language file
         include('./libraries/select_lang.lib.php3');
         // Sends the Content-Type header
         header('Content-Type: text/html; charset=' . $charset);
@@ -127,14 +129,14 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * if necessary
      */
     if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 120) {
-        require('./libraries/config_import.lib.php3');
+        include('./libraries/config_import.lib.php3');
     }
 
     /**
      * Includes the language file if it hasn't been included yet
      */
     if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')){
-        require('./libraries/select_lang.lib.php3');
+        include('./libraries/select_lang.lib.php3');
     }
 
     /**
@@ -547,7 +549,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         // behaviour of auto-detection due to their setup.
         // See the mailing list message:
         // http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141
-        if ($cfg['PmaAbsoluteUri_DisableWarning'] === FALSE) {
+        if ($cfg['PmaAbsoluteUri_DisableWarning'] == FALSE) {
             $display_pmaAbsoluteUri_warning = 1;
         }
     }
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3
index 72086ca28..6960c3519 100755
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php3
@@ -547,15 +547,15 @@ echo "\n";
         <?php echo PMA_showDocuShort('p/r/procedure_analyse.html'); ?>
         </div>
     </li>
-<?php
 
+<?php
 /**
  * Query box, bookmark, insert data from textfile
  */
 $goto = 'tbl_properties_structure.php3';
 require('./tbl_query_box.php3');
-
 ?>
+
 </ul>