From 4b261972fa87a7863a5cec4422d73326e2751934 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 23 Oct 2005 20:30:33 +0000
Subject: [PATCH] Removoing magic number indicies

---
 api.php | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/api.php b/api.php
index 445bbf6..5132bfd 100644
--- a/api.php
+++ b/api.php
@@ -47,6 +47,21 @@ if (!defined('REQ_YES'))
 	* Set by a cusotm set_*() function
 	*/
 	define('REQ_SET', 2);
+	
+	/**
+	* Index for cleaning type
+	*/
+	define('F_TYPE', 0);
+	
+	/**
+	* Index for requirement type
+	*/
+	define('F_REQ', 1);
+	
+	/**
+	* Index for verification type
+	*/
+	define('F_VERIFY', 2);
 }
 
 /**
@@ -141,19 +156,19 @@ class API
 			return;
 		}
 		
-		$this->values["$field"] = ($doclean ? $this->registry->clean($value, $this->fields["$field"][0]) : $value);
+		$this->values["$field"] = ($doclean ? $this->registry->clean($value, $this->fields["$field"][F_TYPE]) : $value);
 		
 		$this->setfields[] = $field;
 		
-		if (isset($this->fields["$field"][2]) AND $doverify)
+		if (isset($this->fields["$field"][F_VERIFY]) AND $doverify)
 		{
-			if ($this->fields["$field"][2] == ':self')
+			if ($this->fields["$field"][F_VERIFY] == ':self')
 			{
 				$verify = $this->{"verify_$field"}($field);
 			}
 			else
 			{
-				$verify = $this->{$this->fields["$field"][2]}($field);
+				$verify = $this->{$this->fields["$field"][F_VERIFY]}($field);
 			}
 			
 			if (!$verify)
@@ -180,7 +195,7 @@ class API
 		{
 			foreach ($this->fields AS $name => $options)
 			{
-				if ($options[1] == REQ_AUTO)
+				if ($options[F_REQ] == REQ_AUTO)
 				{
 					if (!$this->values["$name"])
 					{
@@ -188,7 +203,7 @@ class API
 						continue;
 					}
 					
-					$this->condition = "$name = " . (($options[0] == TYPE_NOCLEAN OR $options[0] == TYPE_STR) ? "'" . $this->values["$name"] . "'" : $this->values["$name"]);
+					$this->condition = "$name = " . (($options[F_TYPE] == TYPE_NOCLEAN OR $options[F_TYPE] == TYPE_STR) ? "'" . $this->values["$name"] . "'" : $this->values["$name"]);
 				}
 			}
 			
@@ -260,7 +275,7 @@ class API
 		foreach ($this->setfields AS $field)
 		{
 			$fields[] = $field;
-			$values[] = (($this->fields["$field"][0] == TYPE_NOCLEAN OR $this->fields["$field"][0] == TYPE_STR) ? "'" . $this->values["$field"] . "'" : $this->values["$field"]);
+			$values[] = (($this->fields["$field"][F_TYPE] == TYPE_NOCLEAN OR $this->fields["$field"][F_TYPE] == TYPE_STR) ? "'" . $this->values["$field"] . "'" : $this->values["$field"]);
 		}
 		
 		$this->registry->modules['db_mysql']->query("INSERT INTO {$this->prefix}{$this->table} (" . implode(',', $fields) . ") VALUES (" . implode(',', $values) . ")");
@@ -283,7 +298,7 @@ class API
 		
 		foreach ($this->setfields AS $field)
 		{
-			$updates[] = "$field = " . (($this->fields["$field"][0] == TYPE_NOCLEAN OR $this->fields["$field"][0] == TYPE_STR) ? "'" . $this->values["$field"] . "'" : $this->values["$field"]);
+			$updates[] = "$field = " . (($this->fields["$field"][F_TYPE] == TYPE_NOCLEAN OR $this->fields["$field"][F_TYPE] == TYPE_STR) ? "'" . $this->values["$field"] . "'" : $this->values["$field"]);
 		}
 		$updates = implode(', ', $updates);
 		
@@ -318,7 +333,7 @@ class API
 	{
 		foreach ($this->fields AS $name => $options)
 		{
-			if ($options[1] == REQ_YES)
+			if ($options[F_REQ] == REQ_YES)
 			{
 				if (!isset($this->values["$name"]))
 				{
@@ -326,7 +341,7 @@ class API
 					trigger_error('Field `' . $name . '` was not set', E_USER_ERROR);
 				}
 			}
-			else if ($options[1] == REQ_SET)
+			else if ($options[F_REQ] == REQ_SET)
 			{
 				$this->{"set_$name"}();
 			}
-- 
2.43.5