Changeset 1069:f06abe1a1e59

Timestamp:

12/15/12 11:52:52 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Public message now differs from admin message when DB connection fails, fixes #1306

Files:

• inc/admin/prepend.php (modified) (2 diffs)
• inc/prepend.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

inc/admin/prepend.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
+define('DC_CONTEXT_ADMIN',true);
+
 require_once dirname(__FILE__).'/../prepend.php';
 
@@ -19 +21 @@
 // HTTP/1.0
 header("Pragma: no-cache");
-
-define('DC_CONTEXT_ADMIN',true);
 
 function dc_valid_fav($url) {

inc/prepend.php

@@ -162 +162 @@
 } catch (Exception $e) {
      init_prepend_l10n();
-     __error(__('Unable to connect to database')
-          ,$e->getCode() == 0 ?
-          sprintf(__('<p>This either means that the username and password information in '.
-          'your <strong>config.php</strong> file is incorrect or we can\'t contact '.
-          'the database server at "<em>%s</em>". This could mean your '.
-          'host\'s database server is down.</p> '.
-          '<ul><li>Are you sure you have the correct username and password?</li>'.
-          '<li>Are you sure that you have typed the correct hostname?</li>'.
-          '<li>Are you sure that the database server is running?</li></ul>'.
-          '<p>If you\'re unsure what these terms mean you should probably contact '.
-          'your host. If you still need help you can always visit the '.
-          '<a href="http://forum.dotclear.net/">Dotclear Support Forums</a>.</p>').
-          (DC_DEBUG ?
-               __('The following error was encountered while trying to read the database:').'</p><ul><li>'.$e->getMessage().'</li></ul>' :  '')
-          ,(DC_DBHOST != '' ? DC_DBHOST : 'localhost')
-          )
-          : ''
-          ,20);
+     if (!defined('DC_CONTEXT_ADMIN')) {
+          __error(__('Site temporarily unavailable'),
+               __('<p>We apologize for this temporary unavailability.<br />'.
+               'Thank you for your understanding.</p>'),
+               20);
+     } else {
+          __error(__('Unable to connect to database')
+               ,$e->getCode() == 0 ?
+               sprintf(__('<p>This either means that the username and password information in '.
+               'your <strong>config.php</strong> file is incorrect or we can\'t contact '.
+               'the database server at "<em>%s</em>". This could mean your '.
+               'host\'s database server is down.</p> '.
+               '<ul><li>Are you sure you have the correct username and password?</li>'.
+               '<li>Are you sure that you have typed the correct hostname?</li>'.
+               '<li>Are you sure that the database server is running?</li></ul>'.
+               '<p>If you\'re unsure what these terms mean you should probably contact '.
+               'your host. If you still need help you can always visit the '.
+               '<a href="http://forum.dotclear.net/">Dotclear Support Forums</a>.</p>').
+               (DC_DEBUG ?
+                    __('The following error was encountered while trying to read the database:').'</p><ul><li>'.$e->getMessage().'</li></ul>' :  '')
+               ,(DC_DBHOST != '' ? DC_DBHOST : 'localhost')
+               )
+               : ''
+               ,20);
+     }
 }
 

locales/fr/main.po

@@ -2865 +2865 @@
 msgstr "Impossible de lire le répertoire"
 
+msgid "Site temporarily unavailable"
+msgstr "Site temporairement indisponible"
+
+msgid "<p>We apologize for this temporary unavailability.<br />Thank you for your understanding.</p>"
+msgstr "<p>Veuillez nous excuser pour cette indisponibilité momentanée.<br />Merci de votre compréhension.</p>"
+
 msgid "Unable to connect to database"
 msgstr "Connexion à la base de données impossible"