Improved error handling in DB connection failure

thomascube

2006-03-14 8affba5be0de8ec5b7bf71e12171ccb53ead497b

 index.php

@@ -1,9 +1,8 @@
<?php

/*
 +-----------------------------------------------------------------------+
 | RoundCube Webmail IMAP Client                                         |
 | Version 0.1-20051214                                                  |
 | Version 0.1-20060314                                                  |
 |                                                                       |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
@@ -41,10 +40,14 @@

*/

define('RCMAIL_VERSION', '0.1-20060220');


// define global vars
$INSTALL_PATH = dirname($_SERVER['SCRIPT_FILENAME']);
$OUTPUT_TYPE = 'html';
$JS_OBJECT_NAME = 'rcmail';
$CHARSET = 'UTF-8';

if (empty($INSTALL_PATH))
  $INSTALL_PATH = './';
@@ -58,7 +61,9 @@

ini_set('session.name', 'sessid');
ini_set('session.use_cookies', 1);
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('session.gc_maxlifetime', 21600);
ini_set('session.gc_divisor', 500);
ini_set('error_reporting', E_ALL&~E_NOTICE); 

// increase maximum execution time for php scripts
// (does not work in safe mode)
@@ -105,6 +110,15 @@
// init necessary objects for GUI
load_gui();


// check DB connections and exit on failure
if ($err_str = $DB->is_error())
  {
  raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,
                    'message' => $err_str), FALSE, TRUE);
  }


// error steps
if ($_action=='error' && !empty($_GET['_code']))
  {
@@ -122,7 +136,10 @@
    {
    show_message("cookiesdisabled", 'warning');
    }
  else if (isset($_POST['_user']) && isset($_POST['_pass']) && rcmail_login($_POST['_user'], $_POST['_pass'], $host))
  else if (isset($_POST['_user']) && isset($_POST['_pass']) &&
           rcmail_login(get_input_value('_user', RCUBE_INPUT_POST),
                        get_input_value('_pass', RCUBE_INPUT_POST),
                        $host))
    {
    // send redirect
    header("Location: $COMM_PATH");
@@ -211,7 +228,7 @@
if ($_task=='mail')
  {
  include_once('program/steps/mail/func.inc');

  
  if ($_action=='show' || $_action=='print')
    include('program/steps/mail/show.inc');

@@ -238,13 +255,28 @@

  if ($_action=='addcontact')
    include('program/steps/mail/addcontact.inc');

  if ($_action=='expunge' || $_action=='purge')
    include('program/steps/mail/folders.inc');

  if ($_action=='check-recent')
    include('program/steps/mail/check_recent.inc');

  if ($_action=='getunread')
    include('program/steps/mail/getunread.inc');
    
  if ($_action=='list' && $_GET['_remote'])
    include('program/steps/mail/list.inc');

  if ($_action=='rss')
    include('program/steps/mail/rss.inc');

  // kill compose entry from session
  if (isset($_SESSION['compose']))
    rcmail_compose_cleanup();
    
  // make sure the message count is refreshed
  $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
  }


@@ -267,6 +299,9 @@

  if ($_action=='list' && $_GET['_remote'])
    include('program/steps/addressbook/list.inc');

  if ($_action=='ldappublicsearch')
    include('program/steps/addressbook/ldapsearchform.inc');
  }


@@ -311,4 +346,4 @@
                  'file' => __FILE__,
                  'message' => "Invalid request"), TRUE, TRUE);
                      
?>
?>