Revision: 1779
http://mrbs.svn.sourceforge.net/mrbs/?rev=1779&view=rev
Author: cimorrison
Date: 2011-01-30 10:06:06 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Improved handling of SQL errors
Modified Paths:
--------------
mrbs/trunk/web/add.php
mrbs/trunk/web/admin.php
mrbs/trunk/web/day.php
mrbs/trunk/web/del.php
mrbs/trunk/web/edit_area_room.php
mrbs/trunk/web/edit_entry.php
mrbs/trunk/web/edit_entry_handler.php
mrbs/trunk/web/edit_users.php
mrbs/trunk/web/lang.en
mrbs/trunk/web/month.php
mrbs/trunk/web/mrbs_sql.inc
mrbs/trunk/web/pending.php
mrbs/trunk/web/report.php
mrbs/trunk/web/search.php
mrbs/trunk/web/week.php
Modified: mrbs/trunk/web/add.php
===================================================================
--- mrbs/trunk/web/add.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/add.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -80,7 +80,8 @@
$sql = "INSERT INTO $tbl_area (" . implode(', ',$sql_col) . ") VALUES (" .
implode(', ',$sql_val) . ")";
if (sql_command($sql) < 0)
{
- fatal_error(1, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
$area = sql_insert_id("$tbl_area", "id");
}
@@ -117,7 +118,8 @@
VALUES ('$room_name_q', '$room_name_q', $area,
'$description_q',$capacity)";
if (sql_command($sql) < 0)
{
- fatal_error(1, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
}
// Release the mutex
Modified: mrbs/trunk/web/admin.php
===================================================================
--- mrbs/trunk/web/admin.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/admin.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -43,7 +43,11 @@
if (isset($area))
{
$res = sql_query("SELECT area_name, custom_html FROM $tbl_area WHERE
id=$area LIMIT 1");
- if (! $res) fatal_error(0, sql_error());
+ if (! $res)
+ {
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
+ }
if (sql_count($res) == 1)
{
$row = sql_row_keyed($res, 0);
@@ -210,7 +214,8 @@
$res = sql_query("SELECT * FROM $tbl_room WHERE area_id=$area ORDER BY
sort_key");
if (! $res)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
if (sql_count($res) == 0)
{
Modified: mrbs/trunk/web/day.php
===================================================================
--- mrbs/trunk/web/day.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/day.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -128,7 +128,8 @@
$res = sql_query($sql);
if (! $res)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
$today = array();
@@ -196,7 +197,8 @@
// else
if (! $res)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
if (sql_count($res) == 0)
{
Modified: mrbs/trunk/web/del.php
===================================================================
--- mrbs/trunk/web/del.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/del.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -36,14 +36,15 @@
{
print_header($day, $month, $year, $area, isset($room) ? $room : "");
- // We tell them how bad what theyre about to do is
+ // We tell them how bad what they're about to do is
// Find out how many appointments would be deleted
$sql = "select name, start_time, end_time from $tbl_entry where
room_id=$room";
$res = sql_query($sql);
if (! $res)
{
- echo sql_error();
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
else if (sql_count($res) > 0)
{
Modified: mrbs/trunk/web/edit_area_room.php
===================================================================
--- mrbs/trunk/web/edit_area_room.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/edit_area_room.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -264,7 +264,9 @@
$sql .= implode(",", $assign_array) . " WHERE id=$room";
if (sql_command($sql) < 0)
{
- fatal_error(0, get_vocab("update_room_failed") . sql_error());
+ echo get_vocab("update_room_failed") . "<br>\n";
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
// if everything is OK, release the mutex and go back to
// the admin page (for the new area)
@@ -428,7 +430,9 @@
$sql .= implode(",", $assign_array) . " WHERE id=$area";
if (sql_command($sql) < 0)
{
- fatal_error(0, get_vocab("update_area_failed") . sql_error());
+ echo get_vocab("update_area_failed") . "<br>\n";
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
// If the database update worked OK, go back to the admin page
Header("Location:
admin.php?day=$day&month=$month&year=$year&area=$area");
@@ -492,7 +496,8 @@
$res = sql_query("SELECT id, area_name FROM $tbl_area");
if (!$res)
{
- fatal_error(FALSE, "Fatal error: " . sql_error); // should not happen
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
if (sql_count($res) == 0)
{
Modified: mrbs/trunk/web/edit_entry.php
===================================================================
--- mrbs/trunk/web/edit_entry.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/edit_entry.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -162,7 +162,8 @@
$res = sql_query($sql);
if (! $res)
{
- fatal_error(1, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
if (sql_count($res) != 1)
{
@@ -282,7 +283,8 @@
$res = sql_query($sql);
if (! $res)
{
- fatal_error(1, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
if (sql_count($res) != 1)
{
Modified: mrbs/trunk/web/edit_entry_handler.php
===================================================================
--- mrbs/trunk/web/edit_entry_handler.php 2011-01-30 09:33:50 UTC (rev
1778)
+++ mrbs/trunk/web/edit_entry_handler.php 2011-01-30 10:06:06 UTC (rev
1779)
@@ -194,7 +194,8 @@
$target_room = sql_query1("SELECT room_id FROM $tbl_entry WHERE id=$id LIMIT
1");
if ($target_room < 0)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
}
else
Modified: mrbs/trunk/web/edit_users.php
===================================================================
--- mrbs/trunk/web/edit_users.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/edit_users.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -783,7 +783,7 @@
{
// Get the error message before the print_header() call because the
print_header()
// function can contain SQL queries and so reset the error message.
- $error_message = sql_error();
+ trigger_error(sql_error(), E_USER_WARNING);
print_header(0, 0, 0, "", "");
// This is unlikely to happen in normal operation. Do not translate.
@@ -792,7 +792,6 @@
print " <fieldset>\n";
print " <legend></legend>\n";
print " <p class=\"error\">Error updating the $tbl_users
table.</p>\n";
- print " <p class=\"error\">$error_message</p>\n";
print " <input type=\"submit\" value=\" " . get_vocab("ok") . "
\">\n";
print " </fieldset>\n";
print "</form>\n";
Modified: mrbs/trunk/web/lang.en
===================================================================
--- mrbs/trunk/web/lang.en 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/lang.en 2011-01-30 10:06:06 UTC (rev 1779)
@@ -407,4 +407,7 @@
// Used in mysql.inc AND pgsql.inc
$vocab["failed_connect_db"] = "Fatal Error: Failed to connect to database";
+// General
+$vocab["fatal_db_error"] = "Fatal error: unfortunately the database is not
available at the moment.";
+
?>
Modified: mrbs/trunk/web/month.php
===================================================================
--- mrbs/trunk/web/month.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/month.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -224,7 +224,8 @@
$res = sql_query($sql);
if (! $res)
{
- echo sql_error();
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
else
{
Modified: mrbs/trunk/web/mrbs_sql.inc
===================================================================
--- mrbs/trunk/web/mrbs_sql.inc 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/mrbs_sql.inc 2011-01-30 10:06:06 UTC (rev 1779)
@@ -42,7 +42,9 @@
$res = sql_query($sql);
if (! $res)
{
- fatal_error(TRUE, "Fatal error: " . sql_error()); // probably because the
table hasn't been created properly
+ // probably because the table hasn't been created properly
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
if (sql_count($res) == 0)
{
@@ -344,7 +346,9 @@
if (sql_command($sql) < 0)
{
- fatal_error(TRUE, "Fatal error: " . sql_error()); // probably because the
table hasn't been created properly
+ // probably because the table hasn't been created properly
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
return sql_insert_id($table, "id");
@@ -869,7 +873,8 @@
}
else
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
}
Modified: mrbs/trunk/web/pending.php
===================================================================
--- mrbs/trunk/web/pending.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/pending.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -189,7 +189,8 @@
$res = sql_query($sql);
if (! $res)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
if (sql_count($res) == 0)
{
Modified: mrbs/trunk/web/report.php
===================================================================
--- mrbs/trunk/web/report.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/report.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -1018,7 +1018,8 @@
$res = sql_query($sql);
if (! $res)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
$nmatch = sql_count($res);
}
Modified: mrbs/trunk/web/search.php
===================================================================
--- mrbs/trunk/web/search.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/search.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -135,7 +135,8 @@
}
if ($total < 0)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
if ($total <= 0)
{
@@ -165,7 +166,8 @@
$result = sql_query($sql);
if (! $result)
{
- fatal_error(0, sql_error());
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(FALSE, get_vocab("fatal_db_error"));
}
$num_records = sql_count($result);
Modified: mrbs/trunk/web/week.php
===================================================================
--- mrbs/trunk/web/week.php 2011-01-30 09:33:50 UTC (rev 1778)
+++ mrbs/trunk/web/week.php 2011-01-30 10:06:06 UTC (rev 1779)
@@ -195,7 +195,8 @@
$res = sql_query($sql);
if (! $res)
{
- echo sql_error();
+ trigger_error(sql_error(), E_USER_WARNING);
+ fatal_error(TRUE, get_vocab("fatal_db_error"));
}
else
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
