From b3e0e6e979f83c5b42727d59d44fd57377d058a2 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 15 May 2005 01:48:28 +0000
Subject: [PATCH] r143: - s /error('-1')/error(phrase('error_invalid_id'))/g -
 Fixed a problem where phrase('Error') was being called instead of
 phrase('error') [includes/adminfunctions.php]

---
 admin/priority.php          | 2 +-
 admin/product.php           | 8 ++++----
 admin/resolution.php        | 2 +-
 admin/severity.php          | 2 +-
 admin/status.php            | 2 +-
 admin/usergroup.php         | 2 +-
 docs/todo.txt               | 1 -
 includes/adminfunctions.php | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/admin/priority.php b/admin/priority.php
index 7e53eb9..81ce86a 100755
--- a/admin/priority.php
+++ b/admin/priority.php
@@ -85,7 +85,7 @@ if ($_REQUEST['do'] == 'edit')
 	$priority = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "priority WHERE priorityid = " . intval($bugsys->in['priorityid']));
 	if (!is_array($priority))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$admin->page_start(phrase('edit_priority'));
diff --git a/admin/product.php b/admin/product.php
index 08c5b5b..67815f9 100755
--- a/admin/product.php
+++ b/admin/product.php
@@ -99,7 +99,7 @@ if ($_REQUEST['do'] == 'addversion')
 		$product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . intval($bugsys->in['productid']));
 		if (!is_array($product))
 		{
-			$admin->error('-1');
+			$admin->error(phrase('error_invalid_id'));
 		}
 	}
 	else
@@ -144,7 +144,7 @@ if ($_REQUEST['do'] == 'editversion')
 	$version = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "version WHERE versionid = " . intval($bugsys->in['versionid']));
 	if (!is_array($version))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$admin->form_start('product.php', 'updateversion');
@@ -241,7 +241,7 @@ if ($_REQUEST['do'] == 'updateproduct')
 	
 	if (empty($bugsys->in['productid']))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$db->query("UPDATE " . TABLE_PREFIX . "product SET title = '" . $bugsys->in['title'] . "', shortname = '" . $bugsys->in['shortname'] . "', description = '" . $bugsys->in['description'] . "', displayorder = " . intval($bugsys->in['displayorder']) . " WHERE productid = " . intval($bugsys->in['productid']));
@@ -259,7 +259,7 @@ if ($_REQUEST['do'] == 'editproduct')
 	$product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . intval($bugsys->in['productid']));
 	if (!is_array($product))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$admin->form_start('product.php', 'updateproduct');
diff --git a/admin/resolution.php b/admin/resolution.php
index 69caa2d..39c2f52 100755
--- a/admin/resolution.php
+++ b/admin/resolution.php
@@ -84,7 +84,7 @@ if ($_REQUEST['do'] == 'edit')
 	$resolution = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "resolution WHERE resolutionid = " . intval($bugsys->in['resolutionid']));
 	if (!is_array($resolution))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$admin->page_start(phrase('edit_resolution'));
diff --git a/admin/severity.php b/admin/severity.php
index 64e9d28..8fe5fdd 100755
--- a/admin/severity.php
+++ b/admin/severity.php
@@ -85,7 +85,7 @@ if ($_REQUEST['do'] == 'edit')
 	$severity = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "severity WHERE severityid = " . intval($bugsys->in['severityid']));
 	if (!is_array($severity))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$admin->page_start(phrase('edit_severity'));
diff --git a/admin/status.php b/admin/status.php
index ddde8e0..26d0b0f 100755
--- a/admin/status.php
+++ b/admin/status.php
@@ -85,7 +85,7 @@ if ($_REQUEST['do'] == 'edit')
 	$status = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "status WHERE statusid = " . intval($bugsys->in['statusid']));
 	if (!is_array($status))
 	{
-		$admin->error('-1');
+		$admin->error(phrase('error_invalid_id'));
 	}
 	
 	$admin->page_start(phrase('edit_status'));
diff --git a/admin/usergroup.php b/admin/usergroup.php
index eaa77e9..b763027 100755
--- a/admin/usergroup.php
+++ b/admin/usergroup.php
@@ -71,7 +71,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
 		$usergroup = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . intval($bugsys->in['usergroupid']));
 		if (!is_array($usergroup))
 		{
-			$admin->error('-1');
+			$admin->error(phrase('error_invalid_id'));
 		}
 		
 		$admin->form_hidden_field('usergroupid', $usergroup['usergroupid']);
diff --git a/docs/todo.txt b/docs/todo.txt
index b4b5341..23b16c8 100755
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -13,7 +13,6 @@ BUGTRACK 1.0
 - Custom bug fields
 - Put either inline admin help or a "what this does" description on each of the widget pages
 - Ability to set default templates in the description field
-- Update all $admin->error('-1') to something useful
 
 ----------------------------------------
   GENERAL USER END
diff --git a/includes/adminfunctions.php b/includes/adminfunctions.php
index 510f257..9bc277e 100755
--- a/includes/adminfunctions.php
+++ b/includes/adminfunctions.php
@@ -49,7 +49,7 @@ EOD;
 	function error($message)
 	{
 		$this->page_start(phrase('error'));
-		$this->page_message(phrase('Error'), $message);
+		$this->page_message(phrase('error'), $message);
 		$this->page_end();
 		
 		exit;
-- 
2.22.5