From 1dce095546b117f0d36f9c20a3d27341ea10af6f Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sat, 17 Sep 2005 02:22:07 +0000
Subject: [PATCH] merging changes from sandboxes

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@856 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 app/views/layouts/default.thtml               |  12 +-
 app/views/layouts/flash.thtml                 |   8 +-
 app/views/pages/home.thtml                    |  18 +-
 config/core.php                               |   3 +
 config/tags.ini.php                           |   2 +-
 index.php                                     |   2 +-
 libs/bake.php                                 |   2 +-
 libs/basics.php                               |  82 +++++++-
 libs/cache.php                                | 195 +++++++++---------
 libs/class_registry.php                       |  37 ++--
 libs/controller.php                           |  30 +--
 .../templates/scaffolds/edit.thtml            |   7 +-
 .../templates/scaffolds/list.thtml            |  16 +-
 .../controllers/templates/scaffolds/new.thtml |   2 +-
 .../templates/scaffolds/show.thtml            |  15 +-
 libs/dbo/dbo_mysql.php                        |  14 +-
 libs/dispatcher.php                           |  85 ++++----
 libs/file.php                                 |  32 ++-
 libs/flay.php                                 |  95 +++++----
 libs/folder.php                               |   3 +-
 libs/helpers/ajax.php                         |  13 +-
 libs/helpers/html.php                         |  17 +-
 libs/helpers/javascript.php                   |  23 ++-
 libs/model.php                                |  22 +-
 libs/neat_array.php                           |  40 ++--
 libs/sanitize.php                             | 110 +++++-----
 libs/scaffold.php                             |  72 ++++---
 libs/view.php                                 |   5 +-
 public/img/bg_fade.gif                        | Bin 0 -> 1147 bytes
 public/img/bg_header.gif                      | Bin 0 -> 531 bytes
 public/img/logo.png                           | Bin 0 -> 27968 bytes
 public/img/red_box.gif                        | Bin 0 -> 45 bytes
 public/index.php                              |   2 +-
 tests/core/cases/libs/inflector.test.php      |   3 +-
 vendors/simpletest/simple_test.php            |  10 +
 35 files changed, 549 insertions(+), 428 deletions(-)
 create mode 100644 public/img/bg_fade.gif
 create mode 100644 public/img/bg_header.gif
 create mode 100644 public/img/logo.png
 create mode 100644 public/img/red_box.gif
diff --git a/app/views/layouts/default.thtml b/app/views/layouts/default.thtml
index 32b3e5e8b..28b9d27de 100644
--- a/app/views/layouts/default.thtml
+++ b/app/views/layouts/default.thtml
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-   <title><?=$title_for_layout?></title>
-   <?=$html->charsetTag('UTF-8')?>
-   <?=$html->cssTag('default')?>  
-   <?=$html->cssTag('forms')?>
+   <title><?php echo $title_for_layout?></title>
+   <?php echo $html->charsetTag('UTF-8')?>
+   <?php echo $html->cssTag('default')?>  
+   <?php echo $html->cssTag('forms')?>
 </head>
 
 <body>
 <div id="main">
-<?=$content_for_layout?>
+<?php echo $content_for_layout?>
 
  <p>
-<a id="logo" href="http://www.cakephp.org/" target="_new"><img src="/img/pbcake.gif" width="120" height="28" alt="CakePHP : Rapid Development Framework" /></a>
+<a id="logo" href="http://www.cakephp.org/" target="_new"><img src="<?php echo $html->url("/img/pbcake.gif"); ?>" width="120" height="28" alt="CakePHP : Rapid Development Framework" /></a>
 </p>
 </div>
 </body>
diff --git a/app/views/layouts/flash.thtml b/app/views/layouts/flash.thtml
index f32a024cb..df81eddbb 100644
--- a/app/views/layouts/flash.thtml
+++ b/app/views/layouts/flash.thtml
@@ -1,10 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="pl" xml:lang="pl">
 <head>
-<title><?=$page_title?></title>
+<title><?php echo $page_title?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <?php if(DEBUG == 0) { ?>
-<meta http-equiv="Refresh" content="<?=$time?>;url=<?=$url?>" />
+<meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>" />
 <?php } ?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
@@ -15,7 +15,7 @@ A:HOVER { text-decoration: underline; color:#44E }
 
 <body>
 
-<p><a href="<?=$url?>"><?=$message?></a></p>
+<p><a href="<?php echo $url?>"><?php echo $message?></a></p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/app/views/pages/home.thtml b/app/views/pages/home.thtml
index ee3832d65..dd6cd4ae3 100644
--- a/app/views/pages/home.thtml
+++ b/app/views/pages/home.thtml
@@ -1,10 +1,10 @@
 <h1>CakePHP <em>Works!</em></h1><br/>
 <hr/>
-Your database configuration file is <?= file_exists(CONFIGS.'database.php') ? 'present.'. $filePresent = ' ' : 'not present.';?><br/>
-<? $db = DboFactory::getInstance(); ?>
-<? if (!empty($filePresent)):?>
-Cake <?=$db->connected ? "is able to" : "is not able to" ?> connect to the database.
-<?endif?>
+Your database configuration file is <?php echo  file_exists(CONFIGS.'database.php') ? 'present.'. $filePresent = ' ' : 'not present.';?><br/>
+<?php $db = DboFactory::getInstance(); ?>
+<?php if (!empty($filePresent)):?>
+Cake <?php echo $db->connected ? "is able to" : "is not able to" ?> connect to the database.
+<?php endif; ?>
 <hr/>
 <br/>
 <h2>Editing <em>this Page</em></h2>
@@ -19,10 +19,10 @@ To change the content of this page, edit <code>/app/views/pages/home.thtml</code
 
 <h2>Get <em>Involved</em></h2>
 <p>Cake PHP needs you! We have an active user base and are always open to new bug reports or feature ideas!</p><br/>
-<?=$html->linkOut('Google Group','http://groups-beta.google.com/group/cake-php')?> &ndash; for public discussions about everything Cake.<br/>
-<?=$html->linkOut('Wiki','https://trac.cakephp.org/wiki')?> &ndash; fastest way of getting newest information on Cake PHP.<br/>
-<?=$html->linkOut('Report a bug or feature request','https://trac.cakephp.org/newticket')?>.<br/>
-<?=$html->linkOut('Roadmap','https://trac.cakephp.org/roadmap')?> &ndash; check our plans for the bright future.<br/>
+<?php echo $html->linkOut('Google Group','http://groups-beta.google.com/group/cake-php')?> &ndash; for public discussions about everything Cake.<br/>
+<?php echo $html->linkOut('Wiki','https://trac.cakephp.org/wiki')?> &ndash; fastest way of getting newest information on Cake PHP.<br/>
+<?php echo $html->linkOut('Report a bug or feature request','https://trac.cakephp.org/newticket')?>.<br/>
+<?php echo $html->linkOut('Roadmap','https://trac.cakephp.org/roadmap')?> &ndash; check our plans for the bright future.<br/>
 #cakephp on irc.euirc.net for quick help<br/>
 </p>
 <br/>
diff --git a/config/core.php b/config/core.php
index 7ffa6cb2a..76dd1ce91 100644
--- a/config/core.php
+++ b/config/core.php
@@ -36,6 +36,9 @@
  * - 0: production
  * - 1: development
  * - 2: full debug with sql
+ *
+ * In production, the "flash messages" redirect after a time interval. 
+ * With the other debug levels you get to click the "flash message" to continue.
  */
 define('DEBUG', 1);
 
diff --git a/config/tags.ini.php b/config/tags.ini.php
index 9f4d1f099..7d0bc014e 100644
--- a/config/tags.ini.php
+++ b/config/tags.ini.php
@@ -99,7 +99,7 @@ tableCell = "<td%s>%s</td>"
 tableRow = "<tr%s>%s</tr>"
 
 ; Tag template for a CSS link tag. 
-css = "<link rel="%s" type="text/css" href="%s" />"
+css = "<link rel="%s" type="text/css" href="%s" %s/>"
 
 ; Tag template for a charset meta-tag.
 charset = "<meta http-equiv="Content-Type" content="text/html; charset=%s" />"
diff --git a/index.php b/index.php
index df1c1e9dd..06176ca8d 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id:$ */
+/* SVN FILE: $Id$ */
 
 /**
  * Short description for file.
diff --git a/libs/bake.php b/libs/bake.php
index ae2bd1ccc..a851f6d37 100644
--- a/libs/bake.php
+++ b/libs/bake.php
@@ -444,7 +444,7 @@ class %sTest extends TestCase {
    }
 
 /**
- * Creates a test for a given model.
+ * Creates a test for given model.
  *
  * @param string $name
  * @return boolean
diff --git a/libs/basics.php b/libs/basics.php
index 4f009ed00..6e728895c 100644
--- a/libs/basics.php
+++ b/libs/basics.php
@@ -32,7 +32,7 @@
  */
 
 /**
- * Basic defines
+ * Basic defines for timing functions.
  */
 define('SECOND',  1);
 define('MINUTE', 60 * SECOND);
@@ -103,8 +103,8 @@ function loadController ($name)
 /**
   * Lists PHP files in given directory.
   *
-  * @param string $path Path to scan for files
-  * @return array List of files in directory
+  * @param string $path 	Path to scan for files
+  * @return array 			List of files in directory
   */
 function listClasses($path) 
 {
@@ -115,7 +115,7 @@ function listClasses($path)
 /**
   * Loads configuration files
   *
-  * @return boolean True on success.
+  * @return boolean Success
   */
 function config () 
 {
@@ -160,7 +160,7 @@ function uses ()
 }
 
 /**
- * Require given files in the VENDORS directory. Function takes optional number of parameters.
+ * Require given files in the VENDORS directory. Takes optional number of parameters.
  *
  * @param string $name Filename without the .php part.
  *
@@ -175,10 +175,12 @@ function vendor($name)
 }
 
 /**
- * Setup a debug point.
+ * Print out debug information about given variable.
  *
- * @param boolean $var
- * @param boolean $show_html
+ * Only runs if DEBUG level is non-zero.
+ *
+ * @param boolean $var		Variable to show debug information for.
+ * @param boolean $show_html	If set to true, the method prints the debug data in a screen-friendly way.
  */
 function debug($var = false, $show_html = false) 
 {
@@ -271,4 +273,66 @@ if (!function_exists('array_combine'))
    }
 }
 
-?>
+function h($text)
+{
+	return htmlspecialchars($text);
+}
+
+
+function a()
+{
+	$args = func_get_args();
+	return $args;
+}
+
+
+function ha()
+{
+	$args = func_get_args();
+
+	for($l=0 ; $l<count($args) ; $l++)
+	{
+		$a[$args[$l]] = $l+1<count($args) ? $args[$l+1] : null;
+		$l++;
+	}
+	return $a;
+}
+
+
+function e($text)
+{
+	echo $text;
+}
+
+function pr($var)
+{
+	if(DEBUG > 0)
+	{
+		echo "<pre>";
+		print_r($var);
+		echo "</pre>";
+	}
+}
+
+function params($p)
+{
+
+	if(!is_array($p) || count($p) == 0)
+	{
+		return null;
+	}
+	else
+	{
+		if(is_array($p[0]) && count($p) == 1)
+		{
+			return $p[0];
+		}
+		else
+		{
+			return $p;
+		}
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/libs/cache.php b/libs/cache.php
index c14eed8aa..d2267f686 100644
--- a/libs/cache.php
+++ b/libs/cache.php
@@ -49,113 +49,114 @@ uses('model');
  */
 class Cache extends Model {
 
-/**
-  * Identifier. Either an MD5 string or NULL.
-  *
-  * @var unknown_type
-  */
-   var $id = null;
+	/**
+      * Identifier. Either an MD5 string or NULL.
+      *
+      * @var string
+      */
+	var $id = null;
 
-/**
-  * Content container for cache data.
-  *
-  * @var unknown_type
-  */
-   var $data = null;
+	/**
+      * Content container for cache data.
+      *
+      * @var unknown_type
+      */
+	var $data = null;
 
-/**
-  * Content to be cached.
-  *
-  * @var unknown_type
-  */
-   var $for_caching = null;
+	/**
+      * Content to be cached.
+      *
+      * @var unknown_type
+      */
+	var $for_caching = null;
 
-/**
-  * Name of the database table used for caching.
-  *
-  * @var unknown_type
-  */
-   var $use_table = 'cache';
+	/**
+      * Name of the database table used for caching.
+      *
+      * @var string
+      */
+	var $use_table = 'cache';
 
-/**
-  * Constructor. Generates an md5'ed id for internal use. Calls the constructor on Model as well.
-  *
-  * @param unknown_type $id
-  */
-   function __construct ($id) 
-   {
-      $this->id = (md5($id));
-      parent::__construct($this->id);
-   }
+	/**
+      * Constructor. Generates an md5'ed id for internal use. Calls the constructor on Model as well.
+      *
+      * @param unknown_type $id
+      */
+	function __construct ($id)
+	{
+		$this->id = (md5($id));
+		parent::__construct($this->id);
+	}
 
-/**
-  * Returns this object's id after setting it. If no $id is given then $this->id is returned.
-  *
-  * @param unknown_type $id
-  * @return unknown
-  */
-   function id ($id=null) 
-   {
-      if (!$id) return $this->id;
-      return ($this->id = $id);
-   }
+	/**
+      * Returns this object's id after setting it. If called without parameters the current object's id is returned.
+      *
+      * @param unknown_type $id
+      * @return unknown
+      */
+	function id ($id=null)
+	{
+		if (!$id) return $this->id;
+		return ($this->id = $id);
+	}
 
-/**
-  * Save $content in cache for $keep_for seconds.
-  *
-  * @param string $content Content to keep in cache.
-  * @param int $keep_for Number of seconds to keep data in cache.
-  * @return unknown
-  */
-   function remember ($content, $keep_for=CACHE_PAGES_FOR) 
-   {
-      $data = addslashes($this->for_caching.$content);
-      $expire = date("Y-m-d H:i:s",time()+($keep_for>0? $keep_for: 999999999));
-      return $this->query("REPLACE {$this->use_table} (id,data,expire) VALUES ('{$this->id}', '{$data}', '{$expire}')");
-   }
+	/**
+      * Store given content in cache database.
+      *
+      * @param string $content 		Content to keep in cache.
+      * @param int $keep_for 		Number of seconds to keep data in cache.
+      * @return boolean				Success
+      */
+	function remember ($content, $keep_for=CACHE_PAGES_FOR)
+	{
+		$data = addslashes($this->for_caching.$content);
+		$expire = date("Y-m-d H:i:s",time()+($keep_for>0? $keep_for: 999999999));
+		return $this->query("REPLACE {$this->use_table} (id,data,expire) VALUES ('{$this->id}', '{$data}', '{$expire}')");
+	}
 
-/**
-  * Returns content from the Cache object itself, if the Cache object has a non-empty data property. Else from the database cache.
-  *
-  * @return unknown
-  */
-   function restore() 
-   {
-      if (empty($this->data['data']))
-         return $this->find("id='{$this->id}' AND expire>NOW()");
-      
-      return $this->data['data'];
-   }
+	/**
+	  * Returns content from the Cache object itself, if the Cache object has a non-empty data property. 
+	  * Else from the database cache.
+ 	  *
+	  * @return unknown
+  	  */
+	function restore()
+	{
+		if (empty($this->data['data']))
+		return $this->find("id='{$this->id}' AND expire>NOW()");
 
-/**
-  * Returns true if the cache data property has current (non-stale) content for given id.
-  *
-  * @return boolean
-  */
-   function has() 
-   {
-      return is_array($this->data = $this->find("id='{$this->id}' AND expire>NOW()"));
-   }
+		return $this->data['data'];
+	}
 
-/**
-  * Appends $string to the for_caching property of the Cache object.
-  *
-  * @param string $string
-  */
-   function append($string) 
-   {
-      $this->for_caching .= $string;
-   }
+	/**
+      * Returns true if the cache data property has current (non-stale) content for given id.
+      *
+      * @return boolean
+      */
+	function has()
+	{
+		return is_array($this->data = $this->find("id='{$this->id}' AND expire>NOW()"));
+	}
 
-/**
-  * Clears the cache database table.
-  *
-  * @return unknown
-  */
-   function clear() 
-   {
-      return $this->query("DELETE FROM {$this->use_table}");
-   }
+	/**
+      * Appends $string to the for_caching property of the Cache object.
+      *
+      * @param string $string
+      */
+	function append($string)
+	{
+		$this->for_caching .= $string;
+	}
+
+	/**
+      * Clears the cache database table.
+      *
+      * @return unknown
+      */
+	function clear()
+	{
+		return $this->query("DELETE FROM {$this->use_table}");
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/libs/class_registry.php b/libs/class_registry.php
index 435a248d2..6e89d20d8 100644
--- a/libs/class_registry.php
+++ b/libs/class_registry.php
@@ -2,9 +2,9 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Class collections.
  * 
- * Long description for file
+ * A repository for class objects, each registered with a key.
  *
  * PHP versions 4 and 5
  *
@@ -34,7 +34,9 @@
 /**
  * Class Collections.
  *
- * Long description for class
+ * A repository for class objects, each registered with a key. 
+ * If you try to add an object with the same key twice, nothing will come of it.
+ * If you need a second instance of an object, give it another key.
  *
  * @package    cake
  * @subpackage cake.libs
@@ -44,15 +46,15 @@
    {
  
 /**
- * Enter description here...
+ * Names of classes with their objects.
  *
- * @var unknown_type
+ * @var array
  * @access private
  */
    var $_objects = array();
 
 /**
- * Enter description here...
+ * Return a singleton instance of the ClassRegistry.
  *
  * @return ClassRegistry instance
  */
@@ -67,10 +69,10 @@
    }
    
 /**
- * Enter description here...
+ * Add $object to the registry, associating it with the name $key.
  *
- * @param unknown_type $key
- * @param unknown_type $object
+ * @param string $key 
+ * @param mixed $object
  */
    function addObject($key, &$object)
    {
@@ -83,10 +85,10 @@
    }
    
 /**
- * Enter description here...
+ * Returns true if given key is present in the ClassRegistry.
  *
- * @param unknown_type $key
- * @return unknown
+ * @param string $key 	Key to look for
+ * @return boolean 		Success
  */
    function isKeySet($key)
    {
@@ -95,18 +97,15 @@
    }
 
 /**
- * Enter description here...
+ * Return object which corresponds to given key.
  *
- * @param unknown_type $key
- * @return unknown
+ * @param string $key
+ * @return mixed
  */
    function &getObject($key)
    {
       $key = strtolower($key);
       return $this->_objects[$key];
    }
-
-   
-   }
-   
+}
 ?>
\ No newline at end of file
diff --git a/libs/controller.php b/libs/controller.php
index 6e699f57d..8ebad666d 100644
--- a/libs/controller.php
+++ b/libs/controller.php
@@ -181,7 +181,7 @@ class Controller extends Object
      * Constructor.
      *
      */
-    function __construct ($params=null)
+    function __construct ()
     {
         // parent::__construct();
         $r = null;
@@ -190,7 +190,7 @@ class Controller extends Object
             die("Controller::__construct() : Can't get or parse my own class name, exiting.");
         }
 
-        $this->name = strtolower($r[1]);
+        $this->name = $r[1];
         $this->viewPath = Inflector::underscore($r[1]);
 
         //Adding Before Filter check
@@ -227,11 +227,15 @@ class Controller extends Object
         $dboFactory = DboFactory::getInstance($this->useDbConfig);
         $this->db =& $dboFactory;
         
-        $model_class = Inflector::singularize($this->name);
+        $match = array(); 
+        preg_match('/(.*)Controller/i', get_class($this), $match);
+        
+        $model_class = Inflector::singularize($match[1]);
+        $modelKey  = strtolower(Inflector::underscore($model_class));
 
         if (class_exists($model_class) && ($this->uses === false))
         {
-            $this->models[$model_class] = new $model_class($id);
+            $this->models[$modelKey] = new $model_class($id);
         }
         elseif ($this->uses)
         {
@@ -245,10 +249,11 @@ class Controller extends Object
             foreach ($uses as $model_name)
             {
                 $model_class = ucfirst(strtolower($model_name));
+                $modelKey  = strtolower(Inflector::underscore($model_class));
 
                 if (class_exists($model_class))
                 {
-                    $this->models[$model_name] = new $model_class($id);
+                    $this->models[$modelKey] = new $model_class($id);
                 }
                 else
                 {
@@ -357,8 +362,9 @@ class Controller extends Object
 
         if(!empty($this->models))
         {
-            foreach ($this->models as $key => $value)
+            foreach ($this->models as $key)
             {
+                $key = Inflector::underscore(get_class($key));
                 if(!empty($this->models[$key]->validationErrors))
                 {
                     $view->validationErrors[$key] =& $this->models[$key]->validationErrors;
@@ -448,14 +454,15 @@ class Controller extends Object
      * @param string $url Relative URL to redirect to after the time expires
      * @param int $time Time to show the message
      */
-    function flash($message, $url, $time=1)
+    function flash($message, $url, $pause=1)
     {
         $this->autoRender = false;
         $this->autoLayout = false;
 
         $this->set('url', $this->base.$url);
         $this->set('message', $message);
-        $this->set('time', $time);
+        $this->set('pause', $pause);
+        $this->set('page_title', $message);
 
         $this->render(null,false,VIEWS.'layouts'.DS.'flash.thtml');
     }
@@ -497,11 +504,11 @@ class Controller extends Object
 
 	    //  figure out what model and table we are working with
 	    $model = Inflector::pluralize($this->name);
-	    $table = Inflector::singularize($this->name);
+	    $table = Inflector::underscore(Inflector::singularize($this->name));
 
 	    //  get all of the column names.
 	    $classRegistry =& ClassRegistry::getInstance();
-	    $objRegistryModel = $classRegistry->getObject($table);
+	    $objRegistryModel = $classRegistry->getObject(Inflector::singularize($model));
 
 	    foreach ($objRegistryModel->_table_info as $tables)
 	    {
@@ -676,7 +683,6 @@ class Controller extends Object
                      $fieldNames[ $tabl['name']]['options'] = array();
 
                      $enumValues = split(',', $fieldLength );
-                     $iCount = 1;
                      foreach ($enumValues as $enum )
                      {
                          $enum = trim( $enum, "'" );
@@ -704,7 +710,7 @@ class Controller extends Object
    	    //  loop through the many to many relations to make a list box.
       	foreach( $objRegistryModel->_manyToMany as $relation )
          {
-            list($tableName, $field, $value, $joinTable, $key1, $key2) = $relation;
+            list($tableName) = $relation;
 
             $otherModelName = Inflector::singularize($tableName);
             $otherModel = new $otherModelName();
diff --git a/libs/controllers/templates/scaffolds/edit.thtml b/libs/controllers/templates/scaffolds/edit.thtml
index a9f05f580..898b41887 100644
--- a/libs/controllers/templates/scaffolds/edit.thtml
+++ b/libs/controllers/templates/scaffolds/edit.thtml
@@ -3,7 +3,7 @@ uses('helpers/form');
 
    $form = new FormHelper();
 
-	echo $html->formTag('/'.$this->name.'/update');
+	echo $html->formTag('/'.Inflector::underscore($this->name).'/update');
 
 	echo $form->generateFields( $html, $fieldNames );
    
@@ -13,9 +13,10 @@ uses('helpers/form');
 <ul class='actions'>
 <?php
    $modelName = Inflector::singularize($this->name);
-   echo "<li>".$html->linkTo('Delete  '.Inflector::humanize($modelName), '/'.$this->viewPath.'/destroy/'.$data[$modelName]['id'])."</li>";
+   $modelKey = Inflector::underscore($modelName);
+   echo "<li>".$html->linkTo('Delete  '.Inflector::humanize($modelName), '/'.$this->viewPath.'/destroy/'.$data[$modelKey]['id'])."</li>";
 
-   foreach( $fieldNames as $field=>$value ) { 
+   foreach( $fieldNames as $field => $value ) { 
       if( isset( $value['foreignKey'] ) )
       {
          echo "<li>".$html->linkTo( "View ".Inflector::humanize($value['controller']), "/".Inflector::underscore($value['controller'])."/show/".$data[Inflector::singularize($params['controller'])][$field] )."</li>";
diff --git a/libs/controllers/templates/scaffolds/list.thtml b/libs/controllers/templates/scaffolds/list.thtml
index b0a3f7e09..3cda7cdcd 100644
--- a/libs/controllers/templates/scaffolds/list.thtml
+++ b/libs/controllers/templates/scaffolds/list.thtml
@@ -1,6 +1,8 @@
 <?php
    $model = Inflector::pluralize($this->name);
-	$table = Inflector::singularize($this->name);
+   //$table = Inflector::underscore(get_class($this->models[strtolower(Inflector::singularize(Inflector::underscore($this->name)))]));
+
+   $modelKey = Inflector::underscore(Inflector::singularize($this->name));
    $humanName = Inflector::humanize($this->name);
    $humanSingularName = Inflector::singularize( $humanName );
 //	var_dump( $data );
@@ -40,18 +42,18 @@
                        {
                           $displayText = $row[$otherModelName][ $otherModelObject->getDisplayField() ];
                        } else{
-                          $displayText = $row[$table][$field];
+                          $displayText = $row[$modelKey][$field];
                        }  
-                          echo $html->linkTo( $displayText, "/".Inflector::underscore($otherControllerName)."/show/".$row[$table][$field] );
+                          echo $html->linkTo( $displayText, "/".Inflector::underscore($otherControllerName)."/show/".$row[$modelKey][$field] );
                        
                      } else {
-                        echo $row[$table ][$field]; 
+                        echo $row[$modelKey][$field]; 
                      } ?>
                </td>
             <?php } // end for each $fieldNames as $field=>value ?>
-               <td class="listactions"><?php echo $html->linkTo('View',"/".$this->viewPath."/show/{$row[$table]['id']}/")?>
-                   <?php echo $html->linkTo('Edit',"/".$this->viewPath."/edit/{$row[$table]['id']}/")?>
-                  <?php echo $html->linkTo('Delete',"/".$this->viewPath."/destroy/{$row[$table]['id']}/")?>
+               <td class="listactions"><?php echo $html->linkTo('View',"/".$this->viewPath."/show/{$row[$modelKey]['id']}/")?>
+                   <?php echo $html->linkTo('Edit',"/".$this->viewPath."/edit/{$row[$modelKey]['id']}/")?>
+                  <?php echo $html->linkTo('Delete',"/".$this->viewPath."/destroy/{$row[$modelKey]['id']}/")?>
                 </td>
    
          </tr>
diff --git a/libs/controllers/templates/scaffolds/new.thtml b/libs/controllers/templates/scaffolds/new.thtml
index 42382da69..3c7a334c1 100644
--- a/libs/controllers/templates/scaffolds/new.thtml
+++ b/libs/controllers/templates/scaffolds/new.thtml
@@ -3,7 +3,7 @@ uses('helpers/form');
 
 $form = new FormHelper();
 
-	echo $html->formTag('/'.$this->name.'/create');
+	echo $html->formTag('/'.Inflector::underscore($this->name).'/create');
 
 	echo $form->generateFields( $html, $fieldNames );
 
diff --git a/libs/controllers/templates/scaffolds/show.thtml b/libs/controllers/templates/scaffolds/show.thtml
index 6f3b3f581..4fa457177 100644
--- a/libs/controllers/templates/scaffolds/show.thtml
+++ b/libs/controllers/templates/scaffolds/show.thtml
@@ -1,5 +1,6 @@
 <?php
    $modelName = Inflector::singularize($this->name);
+   $modelKey = Inflector::underscore($modelName);
    $registry = ClassRegistry::getInstance();
 
 ?>
@@ -11,9 +12,9 @@
          $displayField = $otherModelObject->getDisplayField();
          $displayText = $data[$value['model']][ $displayField ];
             
-            if( !empty($data[$modelName][$field]))
+            if( !empty($data[$modelKey][$field]))
             {
-                echo "<dd>".$html->linkTo($displayText, '/'.Inflector::underscore($value['controller']).'/show/'.$data[$modelName][ $field ] )."</dd>";
+                echo "<dd>".$html->linkTo($displayText, '/'.Inflector::underscore($value['controller']).'/show/'.$data[$modelKey][ $field ] )."</dd>";
             }
             else
             {
@@ -23,9 +24,9 @@
       else
       {
           //  this is just a plain old field.
-          if( !empty($data[$modelName][$field]))
+          if( !empty($data[$modelKey][$field]))
           {
-              echo "<dd>".$data[$modelName][$field]."</dd>";
+              echo "<dd>".$data[$modelKey][$field]."</dd>";
           }
           else
           {
@@ -38,8 +39,8 @@
 </dl>
 <ul class='actions'>
 <?php
-   echo "<li>".$html->linkTo('Edit '.Inflector::humanize($modelName), '/'.$this->viewPath.'/edit/'.$data[$modelName]['id'])."</li>";
-   echo "<li>".$html->linkTo('Delete  '.Inflector::humanize($modelName), '/'.$this->viewPath.'/destroy/'.$data[$modelName]['id'])."</li>";
+   echo "<li>".$html->linkTo('Edit '.Inflector::humanize($modelKey), '/'.$this->viewPath.'/edit/'.$data[$modelKey]['id'])."</li>";
+   echo "<li>".$html->linkTo('Delete  '.Inflector::humanize($modelKey), '/'.$this->viewPath.'/destroy/'.$data[$modelKey]['id'])."</li>";
 
    foreach( $fieldNames as $field=>$value ) { 
       if( isset( $value['foreignKey'] ) )
@@ -146,4 +147,4 @@
 </ul></div>
 
 <?php    } //  end loop through relations
-?>
+?>
\ No newline at end of file
diff --git a/libs/dbo/dbo_mysql.php b/libs/dbo/dbo_mysql.php
index dc21eb3f0..b98710259 100644
--- a/libs/dbo/dbo_mysql.php
+++ b/libs/dbo/dbo_mysql.php
@@ -144,8 +144,18 @@ class DBO_MySQL extends DBO
       $cols = $this->all("DESC {$table_name}");
 
       foreach ($cols as $column)
+      {
         // $fields[] = array('name'=>$column['Field'], 'type'=>$column['Type']);
-			$fields[] = array('name'=>$column[0]['Field'], 'type'=>$column[0]['Type']);
+        if(isset($column['COLUMNS']) && !isset($column[0]))
+        {
+        	$column[0] = $column['COLUMNS'];
+        }
+
+        if(isset($column[0]))
+        {
+					$fields[] = array('name' => $column[0]['Field'], 'type' => $column[0]['Type']);
+				}
+			}
 
       return $fields;
    }
@@ -211,7 +221,7 @@ class DBO_MySQL extends DBO
  */
    function selectLimit ($limit, $offset=null)
    {
-      return $limit? " LIMIT {$limit}".($offset? "{$offset}": null): null;
+      return $limit? " LIMIT".($offset? " {$offset},": null)." {$limit}": null;
    }
 
 /**
diff --git a/libs/dispatcher.php b/libs/dispatcher.php
index 3a1f831fc..816432d67 100644
--- a/libs/dispatcher.php
+++ b/libs/dispatcher.php
@@ -2,9 +2,10 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Dispatcher takes the URL information, parses it for paramters and 
+ * tells the involved controllers what to do.
  * 
- * Long description for file
+ * This is the heart of Cake's operation. 
  *
  * PHP versions 4 and 5
  *
@@ -65,7 +66,7 @@ class Dispatcher extends Object
    var $base = false;
 
 /**
- * Fetches base url.
+ * Constructor.
  */
    function __construct()
    {
@@ -73,30 +74,19 @@ class Dispatcher extends Object
       parent::__construct();
    }
 
+
 /**
- * Dispatches the request (action).
+ * Dispatches and invokes given URL, handing over control to the involved controllers, and then renders the results (if autoRender is set).
  *
- * @param string $url
- * @return array
+ * If no controller of given name can be found, invoke() shows error messages in 
+ * the form of Missing Controllers information. It does the same with Actions (methods of Controllers are called 
+ * Actions).
+ *
+ * @param string $url	URL information to work on.
+ * @return boolean		Success
  */
    function dispatch($url)
    {
-      $params = $this->parseParams($url);
-      $result = $this->invoke($url);
-
-      return $result === true? $params: array();
-   }
-
-/**
- * Enter description here...
- *
- * @param string $url
- * @return unknown
- */
-   function invoke($url)
-   {
-      global $_POST, $_GET, $_FILES, $_SESSION;
-
       $params = $this->parseParams($url);
       $missingController = false;
       $missingAction     = false;
@@ -217,13 +207,11 @@ class Dispatcher extends Object
 /**
  * Returns array of GET and POST parameters. GET parameters are taken from given URL.
  *
- * @param string $from_url
+ * @param string $from_url	URL to mine for parameter information.
  * @return array Parameters found in POST and GET.
  */
    function parseParams($from_url)
    {
-      global $_POST, $_FILES;
-
       // load routes config
       $Route = new Router();
       include CONFIGS.'routes.php';
@@ -233,7 +221,14 @@ class Dispatcher extends Object
       $params['form'] = $_POST;
       if (isset($_POST['data']))
       {
-         $params['data'] = (ini_get('magic_quotes_gpc') == 1) ? $this->stripslashes_deep($_POST['data']) : $_POST['data'];
+         $params['data'] = (ini_get('magic_quotes_gpc') == 1)?
+         	$this->stripslashes_deep($_POST['data']) : $_POST['data'];
+      }
+      if (isset($_GET))
+      {
+         $params['url'] = $this->urldecode_deep($_GET);
+         $params['url'] = (ini_get('magic_quotes_gpc') == 1)?
+         	$this->stripslashes_deep($params['url']) : $params['url'];
       }
 
       foreach ($_FILES as $name => $data)
@@ -254,14 +249,23 @@ class Dispatcher extends Object
         array_map(array('Dispatcher','stripslashes_deep'), $val) : stripslashes($val);
    }
 
+/**
+ * Recursively performs urldecode.
+ *
+ */
+   function urldecode_deep($val)
+   {
+      return (is_array($val)) ? 
+        array_map(array('Dispatcher','urldecode_deep'), $val) : urldecode($val);
+   }
+
 /**
  * Returns a base URL.
  *
- * @return string
+ * @return string	Base URL
  */
    function baseUrl()
    {
-      global $_SERVER;
 
       //non mod_rewrite use:
       if (defined('BASE_URL')) return BASE_URL;
@@ -281,8 +285,8 @@ class Dispatcher extends Object
 /**
  * Displays an error page (e.g. 404 Not found).
  *
- * @param int $code Error code (e.g. 404)
- * @param string $name Name of the error message (e.g. Not found)
+ * @param int $code 	Error code (e.g. 404)
+ * @param string $name 	Name of the error message (e.g. Not found)
  * @param string $message
  */
    function error ($code, $name, $message)
@@ -295,8 +299,8 @@ class Dispatcher extends Object
 /**
  * Convenience method to display a 404 page.
  *
- * @param unknown_type $url
- * @param unknown_type $message
+ * @param string $url 		URL that spawned this message, to be included in the output.
+ * @param string $message 	Message text for the 404 page.
  */
    function error404 ($url, $message)
    {
@@ -304,9 +308,10 @@ class Dispatcher extends Object
    }
 
 /**
- * If DEBUG is set, this displays a 404 error with the message that no controller is set. If DEBUG is not set, nothing happens.
+ * If DEBUG is set, this displays a 404 error with the message that no controller is set. 
+ * If DEBUG is not set, nothing happens.
  *
- * @param string $url
+ * @param string $url	URL that spawned this message, to be included in the output.
  */
    function errorNoController ($url)
    {
@@ -319,7 +324,7 @@ class Dispatcher extends Object
 /**
  * If DEBUG is set, this displays a 404 error with the message that the asked-for controller does not exist. If DEBUG is not set, nothing happens.
  *
- * @param string $url
+ * @param string $url	URL that spawned this message, to be included in the output.
  * @param string $controller_class
  */
    function errorUnknownController ($url, $controller_class)
@@ -333,7 +338,7 @@ class Dispatcher extends Object
 /**
  * If DEBUG is set, this displays a 404 error with the message that no action is set. If DEBUG is not set, nothing happens.
  *
- * @param string $url
+ * @param string $url	URL that spawned this message, to be included in the output.
  */
    function errorNoAction ($url)
    {
@@ -346,7 +351,7 @@ class Dispatcher extends Object
 /**
  * If DEBUG is set, this displays a 404 error with the message that no such action exists. If DEBUG is not set, nothing happens.
  *
- * @param string $url
+ * @param string $url	URL that spawned this message, to be included in the output.
  * @param string $controller_class
  * @param string $action
  */
@@ -359,17 +364,17 @@ class Dispatcher extends Object
    }
 
 /**
-  * When now methods are present in a controller
+  * When methods are now present in a controller
   * scaffoldView is used to call default Scaffold methods if:
   * <code>
   * var $scaffold;
   * </code>
-  * is placed in the controller class definition
+  * is placed in the controller's class definition.
   *
   * @param string $url
   * @param string $controller_class
   * @param array $params
-  * @since Cake v 1.0.0.172
+  * @since Cake v 0.10.0.172
   */
    function scaffoldView ($url, $controller_class, $params)
    {
diff --git a/libs/file.php b/libs/file.php
index 1deea07b8..b55a7dd8d 100644
--- a/libs/file.php
+++ b/libs/file.php
@@ -2,9 +2,8 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Convenience class for reading, writing and appending to files.
  * 
- * Long description for file
  *
  * PHP versions 4 and 5
  *
@@ -33,9 +32,8 @@
 
 
 /**
- * Short description for class
+ * Convenience class for reading, writing and appending to files.
  *
- * Long description for class
  *
  * @package    cake
  * @subpackage cake.libs
@@ -44,16 +42,16 @@
 class File
 {
 /**
- * Enter description here...
+ * Path to file
  *
- * @var unknown_type
+ * @var string
  */
    var $path = null;
    
 /**
- * Enter description here...
+ * Constructor
  *
- * @param unknown_type $path
+ * @param string $path
  * @return File
  */
    function File ($path)
@@ -62,9 +60,9 @@ class File
    }
    
 /**
- * Enter description here...
+ * Return the contents of this File as a string.
  *
- * @return unknown
+ * @return string Contents
  */
    function read ()
    {
@@ -72,10 +70,10 @@ class File
    }
    
 /**
- * Enter description here...
+ * Append given data string to this File.
  *
- * @param unknown_type $data
- * @return unknown
+ * @param string $data Data to write
+ * @return boolean Success
  */
    function append ($data)
    {
@@ -83,11 +81,11 @@ class File
    }
    
 /**
- * Enter description here...
+ * Write given data to this File. 
  *
- * @param unknown_type $data
- * @param unknown_type $mode
- * @return unknown
+ * @param string $data	Data to write to this File.
+ * @param string $mode	Mode of writing. {@link http://php.net/fwrite See fwrite()}.
+ * @return boolean Success
  */
    function write ($data, $mode = 'w')
    {
diff --git a/libs/flay.php b/libs/flay.php
index 23cce5deb..10ca50b86 100644
--- a/libs/flay.php
+++ b/libs/flay.php
@@ -2,9 +2,9 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Text-to-HTML parser.
  * 
- * Long description for file
+ * Text-to-html parser, similar to {@link http://textism.com/tools/textile/ Textile} or {@link http://www.whytheluckystiff.net/ruby/redcloth/ RedCloth}.
  *
  * PHP versions 4 and 5
  *
@@ -37,7 +37,7 @@
 uses('object');
 
 /**
- * Short description for class
+ * Text-to-HTML parser.
  *
  * Text-to-html parser, similar to Textile or RedCloth, only with a little different syntax. 
  *
@@ -49,14 +49,14 @@ uses('object');
 class Flay extends Object
 {
 /**
-  * Enter description here...
+  * Text to be parsed.
   *
   * @var string
   */
    var $text = null;
 
 /**
-  * Enter description here...
+  * Set this to allow HTML in the markup.
   *
   * @var boolean
   */
@@ -65,7 +65,7 @@ class Flay extends Object
 /**
   * Constructor.
   *
-  * @param unknown_type $text
+  * @param string $text
   */
    function __construct ($text=null) 
    {
@@ -74,10 +74,10 @@ class Flay extends Object
    }
 
 /**
-  * Returns $text translated to HTML using the Flay syntax. 
+  * Returns given text translated to HTML using the Flay syntax. 
   *
-  * @param string $text Text to format
-  * @param boolean $bare 
+  * @param string $text 	String to format
+  * @param boolean $bare	Set this to only do <p> transforms and > to &gt;, no typography additions.
   * @param boolean $allowHtml Set this to trim whitespace and disable all HTML
   * @return string Formatted text
   */
@@ -85,15 +85,21 @@ class Flay extends Object
    {
 
       if (empty($text) && empty($this->text))
+      {
          return false;
+      }
 
       $text = $text? $text: $this->text;
 
       // trim whitespace and disable all HTML
       if ($allowHtml)
+      {
          $text = trim($text);
+      }
       else
+      {
          $text = str_replace('<', '&lt;', str_replace('>', '&gt;', trim($text)));
+      }
 
       if (!$bare) 
       {
@@ -195,9 +201,13 @@ class Flay extends Object
                         if (isset($regs[2]))
                         {
                            if (preg_match('#\.(jpg|jpeg|gif|png)$#', $regs[2]))
+                           {
                               $body = "<img src=\"{$prefix}{$regs[2]}\" alt=\"\" />";
+                           }
                            else
+                           {
                               $body = $regs[2];
+                           }
    
                         }
                         else 
@@ -235,10 +245,10 @@ class Flay extends Object
    }
 
 /**
- * Enter description here...
+ * Return the words of the string as an array.
  *
- * @param unknown_type $string
- * @return unknown
+ * @param string $string
+ * @return array Array of words
  */
    function extractWords ($string) 
    {
@@ -246,12 +256,13 @@ class Flay extends Object
    }
 
 /**
- * Enter description here...
+ * Return given string with words in array colorMarked, up to a number of times (defaults to 5).
  *
- * @param unknown_type $words
- * @param unknown_type $string
- * @param unknown_type $max_snippets
- * @return unknown
+ * @param array $words			Words to look for and markup
+ * @param string $string		String to look in
+ * @param integer $max_snippets	Max number of snippets to extract
+ * @return string
+ * @see colorMark
  */
    function markedSnippets ($words, $string, $max_snippets=5) 
    {
@@ -265,7 +276,9 @@ class Flay extends Object
          if (preg_match_all("/[\s,]+.{0,40}{$word}.{0,40}[\s,]+/i", $rest, $r)) 
          {
             foreach ($r as $result)
+            {
                $rest = str_replace($result, '', $rest);
+            }
             $snips = array_merge($snips, $r[0]);
          }
       }
@@ -275,17 +288,17 @@ class Flay extends Object
       	 $snips = array_slice($snips, 0, $max_snippets);
       }
       $joined = join(' <b>...</b> ', $snips);
-      $snips = $joined? "<b>...</b> {$joined} <b>...</b>": substr($string, 0, 80).'<b>...</b>';
+      $snips = $joined? "<b>...</b> {$joined} <b>...</b>": substr($string, 0, 80) . '<b>...</b>';
 
       return Flay::colorMark($words, $snips);
    }
 
 /**
- * Enter description here...
+ * Returns string with EM elements with color classes added.
  *
- * @param unknown_type $words
- * @param unknown_type $string
- * @return unknown
+ * @param array $words 		Array of words to be colorized
+ * @param string $string 	Text in which the words might be found
+ * @return string 
  */
    function colorMark($words, $string) 
    {
@@ -294,52 +307,58 @@ class Flay extends Object
       $nextColorIndex = 0;
       foreach ($words as $word) 
       {
-         $string = preg_replace("/({$word})/i", '<em class="'.$colors[$nextColorIndex%count($colors)]."\">\\1</em>", $string);
+         $string = preg_replace("/({$word})/i", '<em class="' . $colors[$nextColorIndex%count($colors)] . "\">\\1</em>", $string);
          $nextColorIndex++;
       }
 
       return $string;
    }
-
+	
 /**
- * Enter description here...
+ * Returns given text with tags stripped out.
  *
- * @param unknown_type $text
- * @return unknown
+ * @param string $text
+ * @return string
  */
    function toClean ($text) 
    {
       return strip_tags(html_entity_decode($text, ENT_QUOTES));
    }
    
+/**
+ * Return parsed text with tags stripped out.
+ *
+ * @param string $text
+ * @return string
+ */   
    function toParsedAndClean ($text)
    {
       return Flay::toClean(Flay::toHtml($text));
    }
 
 /**
- * Enter description here...
+ * Return a fragment of a text, up to $length characters long, with an ellipsis after it.
  *
- * @param unknown_type $text
- * @param unknown_type $length
- * @param unknown_type $elipsis
- * @return unknown
+ * @param string $text		Text to be truncated.
+ * @param integer $length	Max length of text.
+ * @param string $ellipsis	Sign to print after truncated text.
+ * @return string
  */
-   function fragment ($text, $length, $elipsis='...') 
+   function fragment ($text, $length, $ellipsis='...') 
    {
-      $soft=$length-5;
-      $hard=$length+5;
-      $rx = '/(.{'.$soft.','.$hard.'})[\s,\.:\/="!\(\)<>~\[\]]+.*/';
+      $soft = $length - 5;
+      $hard = $length + 5;
+      $rx = '/(.{' . $soft . ',' . $hard . '})[\s,\.:\/="!\(\)<>~\[\]]+.*/';
       if (preg_match($rx, $text, $r)) 
       {
          $out = $r[1];
       }
       else 
       {
-         $out = substr($text,0,$length);
+         $out = substr($text, 0, $length);
       }
 
-      $out = $out.(strlen($out)<strlen($text)? $elipsis: null);
+      $out = $out . (strlen($out)<strlen($text)? $ellipsis: null);
       return $out;
    }
 }
diff --git a/libs/folder.php b/libs/folder.php
index bf5315ef7..8ab0a7aca 100644
--- a/libs/folder.php
+++ b/libs/folder.php
@@ -2,9 +2,8 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Convenience class for handling directories.
  * 
- * Long description for file
  *
  * PHP versions 4 and 5
  *
diff --git a/libs/helpers/ajax.php b/libs/helpers/ajax.php
index 44c6bec34..207dac9f8 100644
--- a/libs/helpers/ajax.php
+++ b/libs/helpers/ajax.php
@@ -116,9 +116,11 @@ class AjaxHelper extends Helper
 	{
 		// mouse click should call our remote function
 		$html_options['onclick'] = $this->remoteFunction($html, $options);
+		
+		$href = (!empty($options['fallback'])) ? $options['fallback'] : '#';
 
 		// generate actual link
-		return $html->link($title, '#', $html_options);
+		return $html->link($title, $href, $html_options);
 	}
 
 	/**
@@ -142,19 +144,20 @@ class AjaxHelper extends Helper
 
 		if (isset($options['before'])) 
 		{
-			$func .= "{$options['before']}; $function";
+			$func = "{$options['before']}; $function";
 		}
 		if (isset($options['after'])) 
 		{
-			$func .= "$func; {$options['before']};";
+			$func = "$func; {$options['before']};";
 		}
 		if (isset($options['condition'])) 
 		{
-			$func .= "if ({$options['condition']}) { $func; }";
+			$func = "if ({$options['condition']}) { $func; }";
 		}
 		if (isset($options['confirm'])) 
 		{
-			$func .= "if (confirm('" . $this->escapeScript($options['confirm']) . "')) { $func; }";
+			$js = new JavascriptHelper;
+			$func = "if (confirm('" . $js->escapeScript($options['confirm']) . "')) { $func; } else { return false; }";
 		}
 		return $func;
 	}
diff --git a/libs/helpers/html.php b/libs/helpers/html.php
index 61a717324..207771068 100644
--- a/libs/helpers/html.php
+++ b/libs/helpers/html.php
@@ -420,12 +420,13 @@ class HtmlHelper extends Helper
      * @return mixed   Either string or boolean value, depends on AUTO_OUTPUT
      *                 and $return.
      */
-	function image($path, $htmlAttributes = null, $return = false)
-	{
-		$url = $this->base.IMAGES_URL.$path;
-		$alt = $htmlAttributes['alt'];
-		return $this->output(sprintf($this->tags['image'], $url, $alt, $this->parseHtmlOptions($htmlAttributes, null, '', ' ')), $return);
-	}
+
+    function image($path, $htmlAttributes = null, $return = false)
+    {
+        $url = $this->base.IMAGES_URL.$path;
+        $alt = isset($htmlAttributes['alt']) ? $htmlAttributes['alt'] : "";
+        return $this->output(sprintf($this->tags['image'], $url, $alt, $this->parseHtmlOptions($htmlAttributes, null, '', ' ')), $return);
+    }
 
 	/**
      * Creates a text input widget.
@@ -531,11 +532,11 @@ class HtmlHelper extends Helper
 			$cells_out = array();
 			foreach ($line as $cell)
 			{
-				$cells_out[] = sprintf($this->tags['tableCell'], null, $cell);
+				$cells_out[] = sprintf($this->tags['tablecell'], null, $cell);
 			}
 
 			$options = $this->parseHtmlOptions($count%2? $odd_tr_options: $even_tr_options);
-			$out[] = sprintf($this->tags['tableRow'], $options, join(' ', $cells_out));
+			$out[] = sprintf($this->tags['tablerow'], $options, join(' ', $cells_out));
 		}
 
 		return join("\n", $out);
diff --git a/libs/helpers/javascript.php b/libs/helpers/javascript.php
index b7a011547..a2e9b3f79 100644
--- a/libs/helpers/javascript.php
+++ b/libs/helpers/javascript.php
@@ -30,14 +30,6 @@
  */
 
 
-if(!defined("TAG_JAVASCRIPT")) {
-	define("TAG_JAVASCRIPT", '<script type="text/javascript">%s</script>');
-}
-
-if(!defined("TAG_JAVASCRIPT_INCLUDE")) {
-	define("TAG_JAVASCRIPT_INCLUDE", '<script type="text/javascript" src="%s"></script>');
-}
-
 /**
  * Javascript Helper class for easy use of JavaScript.
  *
@@ -57,7 +49,7 @@ class JavascriptHelper extends Helper
      */
     function codeBlock($script)
     {
-        return sprintf(TAG_JAVASCRIPT, $script);
+        return sprintf($this->tags['javascriptBlock'], $script);
     }
 
     /**
@@ -68,7 +60,18 @@ class JavascriptHelper extends Helper
      */
     function link($url)
     {
-        return sprintf(TAG_JAVASCRIPT_INCLUDE, $this->base.$url);
+        return sprintf($this->tags['javascriptLink'], $this->base.$url);
+    }
+
+    /**
+     * Returns a JavaScript include tag for an externally-hosted script
+     *
+     * @param  string $url URL to JavaScript file.
+     * @return string
+     */
+    function linkOut($url)
+    {
+        return sprintf($this->tags['javascriptLink'], $url);
     }
 
 /**
diff --git a/libs/model.php b/libs/model.php
index a2a91dd92..280fcfaef 100644
--- a/libs/model.php
+++ b/libs/model.php
@@ -780,7 +780,7 @@ class Model extends Object
    function set ($one, $two=null) 
    {
       $this->validationErrors = null;
-      $data = is_array($one)? $one: array($one=>$two);
+      $data = is_array($one)? array($this->table=>$one) : array($one=>$two);
 
       foreach ($data as $n => $v) 
       {
@@ -792,21 +792,17 @@ class Model extends Object
                trigger_error('Application error occured, trying to set a field name that doesn\'t exist.', E_USER_WARNING);
          }
 */
-         //$n == 'id'? $this->setId($v): $this->data[$n] = $v;
-
          foreach ($v as $x => $y)
          {
-         			//$x == 'id'? $this->id = $y: $this->data[$n][$x] = $y;
-         			if($x == 'id')
-         			{
-         			$this->id = $y;
-         			}
-         		$this->data[$n][$x] = $y;	
-         			
+             if($x == 'id')
+             {
+                 $this->id = $y;
+             }
+             $this->data[$n][$x] = $y;	
          }
       }
       return $data;
-    }
+   }
 
 /**
  * Sets current Model id to given $id.
@@ -815,7 +811,7 @@ class Model extends Object
  */
    function setId ($id) 
    {
-      $this->id[0] = $id;
+      $this->id = $id;
       
       if(!empty($this->_belongsToOther))
       {
@@ -1329,7 +1325,7 @@ class Model extends Object
                {
                    for ($i = 0; $i< count($original); $i++) 
                    {
-                       $newValue2[$i] = $original[$i];
+                       $newValue[$i] = $original[$i];
                    }
                }
                elseif(!empty($original))
diff --git a/libs/neat_array.php b/libs/neat_array.php
index 9727b02c0..aa73696c2 100644
--- a/libs/neat_array.php
+++ b/libs/neat_array.php
@@ -2,9 +2,9 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Library of array functions for Cake.
  * 
- * Long description for file
+ * Internal use only.
  *
  * PHP versions 4 and 5
  *
@@ -32,7 +32,7 @@
  */
 
 /**
- * Class used for internal manipulation of multiarrays (arrays of arrays).
+ * Class used for internal manipulation of multi-dimensional arrays (arrays of arrays).
  *
  * Long description for class
  *
@@ -63,7 +63,7 @@ class NeatArray
     }
 
     /**
-     * Finds and returns records with $fieldName equal $value from this NeatArray.
+     * Finds and returns records with $fieldName equal to $value from this NeatArray.
      *
      * @param string $fieldName
      * @param string $value
@@ -91,7 +91,7 @@ class NeatArray
     }
 
     /**
-     * Checks if $this->value is array, and removes all empty elements.
+     * Checks if $this->value is an array, and removes all empty elements.
      *
      * @access public
      * @uses NeatArray::value
@@ -114,7 +114,7 @@ class NeatArray
     }
 
     /**
-     * Adds elements from the supplied array to itself.
+     * Adds elements from given array to itself.
      *
      * @param string $value 
      * @return bool
@@ -169,10 +169,10 @@ class NeatArray
     }
 
     /**
-     * Performs an array_filter() on the contents.
+     * Performs an array_filter() on the contents of this NeatArray.
      *
-     * @param unknown_type $with
-     * @return unknown
+     * @param string $with Name of callback function to perform on each element of this NeatArray.
+     * @return array
      */
     function filter ($with)
     {
@@ -180,9 +180,10 @@ class NeatArray
     }
 
     /**
-     * Passes each of its values through a specified function or method. Think of PHP's array_walk.
+     * Passes each of its values through a specified function or method. Think of PHP's {@link http://php.net/array_walk array_walk()}.
      *
-     * @return array
+     * @param string $with Name of callback function
+     * @return array Returns value of NeatArray::value
      * @access public
      * @uses NeatArray::value
      */
@@ -193,10 +194,10 @@ class NeatArray
     }
 
     /**
-     * Enter description here...
+     * Apply $template to all elements of this NeatArray, and return the array itself.
      *
-     * @param unknown_type $template
-     * @return unknown
+     * @param string $template {@link http://php.net/sprintf sprintf()}-compatible string to be applied to all values of this NeatArray.
+     * @return array
      */
     function sprintf($template)
     {
@@ -306,12 +307,13 @@ class NeatArray
 
     /**
      * Enter description here...
+     * @todo Explain this function. almost looks like it creates a tree
      *
-     * @param unknown_type $root
-     * @param unknown_type $idKey
-     * @param unknown_type $parentIdKey
-     * @param unknown_type $childrenKey
-     * @return unknown
+     * @param string $root
+     * @param string $idKey
+     * @param string $parentIdKey
+     * @param string $childrenKey
+     * @return array
      */
     function threaded ($root=null, $idKey='id', $parentIdKey='parent_id', $childrenKey='children')
     {
diff --git a/libs/sanitize.php b/libs/sanitize.php
index 71f2603c9..e1f3eaac5 100644
--- a/libs/sanitize.php
+++ b/libs/sanitize.php
@@ -1,47 +1,47 @@
-<?php
-/* SVN FILE: $Id: sanitize.php 491 2005-07-31 18:31:45Z phpnut $ */
-
-/**
- * Short description for file.
- * 
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
- *
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- *            Larry E. Masters aka PhpNut <nut@phpnut.com>
- *            Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- *  Licensed under The MIT License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource 
- * @author       CakePHP Authors/Developers
- * @copyright    Copyright (c) 2005, CakePHP Authors/Developers
- * @link         https://trac.cakephp.org/wiki/Authors Authors/Developers
- * @package      cake
- * @subpackage   cake.libs
- * @since        CakePHP v 0.9.2
- * @version      $Revision: 491 $
- * @modifiedby   $LastChangedBy: phpnut $
- * @lastmodified $Date: 2005-07-31 13:31:45 -0500 (Sun, 31 Jul 2005) $
- * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-
-/**
- * Data Sanitization.
- *
- * Long description for class
- *
- * @package    cake
- * @subpackage cake.libs
- * @since      CakePHP v 0.9.2
- *
- */
-class Sanitize
+<?php
+/* SVN FILE: $Id: sanitize.php 491 2005-07-31 18:31:45Z phpnut $ */
+
+/**
+ * Short description for file.
+ * 
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright (c) 2005, CakePHP Authors/Developers
+ *
+ * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
+ *            Larry E. Masters aka PhpNut <nut@phpnut.com>
+ *            Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+ *
+ *  Licensed under The MIT License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource 
+ * @author       CakePHP Authors/Developers
+ * @copyright    Copyright (c) 2005, CakePHP Authors/Developers
+ * @link         https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package      cake
+ * @subpackage   cake.libs
+ * @since        CakePHP v 0.9.2
+ * @version      $Revision: 491 $
+ * @modifiedby   $LastChangedBy: phpnut $
+ * @lastmodified $Date: 2005-07-31 13:31:45 -0500 (Sun, 31 Jul 2005) $
+ * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+/**
+ * Data Sanitization.
+ *
+ * Long description for class
+ *
+ * @package    cake
+ * @subpackage cake.libs
+ * @since      CakePHP v 0.9.2
+ *
+ */
+class Sanitize
 {
 
 /**
@@ -62,21 +62,21 @@ class Sanitize
  * @return string
  */
    function sql($string)
-   {
+   {
       if (!ini_get('magic_quotes_gpc'))
       {
          $string = addslashes($string);
       }
-      
+      
       return $string;
    }
 	
-/**
+/**
  * Makes the string safe for display as HTML. Renders entities and converts newlines to <br/>.
  *
  * @param string $string
  * @param boolean $remove
- * @return string
+ * @return string
  */
    function html($string, $remove = false)
    {
@@ -96,10 +96,10 @@ class Sanitize
 	
 /**
  * Recursively sanitizes an array of data for safe input.
- *
+ *
  * @param mixed $toClean
- * @return mixed
- */
+ * @return mixed
+ */
    function cleanArray(&$toClean) 
    {
       return $this->cleanArrayR($toClean);
@@ -136,12 +136,12 @@ class Sanitize
 /**
  * Do we really need to sanitize array keys? If so, we can use this code...
 
-   function cleanKey($key)
+   function cleanKey($key)
    {
       if ($key == "") 
-      {
+      {
          return "";
-      }
+      }
       
       //URL decode and convert chars to HTML entities
       $key = htmlspecialchars(urldecode($key));
@@ -153,7 +153,7 @@ class Sanitize
       $key = preg_replace( "/^([\w\.\-\_]+)$/", "$1", $key );
       
       return $key;
-   }
+   }
  */
 	
 /**
diff --git a/libs/scaffold.php b/libs/scaffold.php
index f92edf5e2..0a362100a 100644
--- a/libs/scaffold.php
+++ b/libs/scaffold.php
@@ -69,7 +69,7 @@ class Scaffold extends Object {
 	 *
 	 * @var unknown_type
 	 */
-	var $model = null;
+	var $modelKey = null;
 
 	/**
 	 * Enter description here...
@@ -115,8 +115,8 @@ class Scaffold extends Object {
 		{
 			die("Scaffold::__construct() : Can't get or parse class name.");
 		}
-		$this->model = strtolower(Inflector::singularize($r[1]));
-		$this->scaffoldTitle = $r[1];
+		$this->modelKey = Inflector::underscore(Inflector::singularize($r[1]));
+		$this->scaffoldTitle = Inflector::humanize($this->modelKey);
 	}
 
 	/**
@@ -142,6 +142,7 @@ class Scaffold extends Object {
 	 */
 	function scaffoldIndex($params)
 	{
+	    $this->controllerClass->pageTitle = Inflector::humanize(Inflector::pluralize($this->modelKey));
 		return $this->scaffoldList($params);
 	}
 
@@ -152,7 +153,7 @@ class Scaffold extends Object {
 	 */
 	function scaffoldShow($params)
 	{
-		$this->controllerClass->params['data'] = $this->controllerClass->models[$this->model]->read();
+		$this->controllerClass->params['data'] = $this->controllerClass->models[$this->modelKey]->read();
 		$this->controllerClass->set('data', $this->controllerClass->params['data'] );
 		$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames( $this->controllerClass->params['data'], false ) );
 		$this->controllerClass->render($this->actionView, '', LIBS.'controllers'.DS.'templates'.DS.'scaffolds'.DS.'show.thtml');
@@ -165,9 +166,8 @@ class Scaffold extends Object {
 	 */
 	function scaffoldList($params)
 	{
-		$model = $this->model;
 		$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames(null,false) );
-		$this->controllerClass->set('data', $this->controllerClass->models[$model]->findAll());
+		$this->controllerClass->set('data', $this->controllerClass->models[$this->modelKey]->findAll());
 		$this->controllerClass->render($this->actionView, '', LIBS.'controllers'.DS.'templates'.DS.'scaffolds'.DS.'list.thtml');
 	}
 
@@ -189,7 +189,7 @@ class Scaffold extends Object {
 	 */
 	function scaffoldEdit($params)
 	{
-		$this->controllerClass->params['data'] = $this->controllerClass->models[$this->model]->read();
+		$this->controllerClass->params['data'] = $this->controllerClass->models[$this->modelKey]->read();
 		//  generate the field names.
 		$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames($this->controllerClass->params['data']) );
 		$this->controllerClass->set('data', $this->controllerClass->params['data']);
@@ -207,14 +207,14 @@ class Scaffold extends Object {
 		$this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames() );
 		$this->cleanUpFields();
 
-		if ($this->controllerClass->models[$this->model]->save($this->controllerClass->params['data']))
+		if ($this->controllerClass->models[$this->modelKey]->save($this->controllerClass->params['data']))
 		{
-			$this->controllerClass->flash('Your '.$this->model.' has been saved.', '/'.$this->controllerClass->viewPath );
+			$this->controllerClass->flash('Your '.$this->modelKey.' has been saved.', '/'.Inflector::underscore($this->controllerClass->viewPath) );
 		}
 		else
 		{
 			$this->controllerClass->set('data', $this->controllerClass->params['data']);
-			$this->controllerClass->validateErrors($this->controllerClass->models[$this->model]);
+			$this->controllerClass->validateErrors($this->controllerClass->models[$this->modelKey]);
 			$this->controllerClass->render($this->actionView, '', LIBS.'controllers'.DS.'templates'.DS.'scaffolds'.DS.'new.thtml');
 		}
 	}
@@ -229,14 +229,14 @@ class Scaffold extends Object {
 		//  clean up the date fields
 		$this->cleanUpFields();
 
-		$this->controllerClass->models[$this->model]->set($this->controllerClass->params['data']);
-		if ( $this->controllerClass->models[$this->model]->save())
+		$this->controllerClass->models[$this->modelKey]->set($this->controllerClass->params['data']);
+		if ( $this->controllerClass->models[$this->modelKey]->save())
 		{
-			$this->controllerClass->flash('The '.$this->model.' has been updated.','/'.$this->controllerClass->name);
+			$this->controllerClass->flash('The '.Inflector::humanize($this->modelKey).' has been updated.','/'.Inflector::underscore($this->controllerClass->viewPath));
 		}
 		else
 		{
-			$this->controllerClass->flash('There was an error updating the '.$this->model,'/'.$this->controllerClass->name);
+			$this->controllerClass->flash('There was an error updating the '.Inflector::humanize($this->modelKey),'/'.Inflector::underscore($this->controllerClass->viewPath));
 		}
 	}
 
@@ -249,15 +249,13 @@ class Scaffold extends Object {
 	{
 		$id = $params['pass'][0];
 		//  figure out what model and table we are working with
-		$controllerName = $this->controllerClass->name;
-		$table = Inflector::singularize($controllerName);
-		if ($this->controllerClass->models[$table]->del($id))
+		if ($this->controllerClass->models[$this->modelKey]->del($id))
 		{
-			$this->controllerClass->flash('The '.$table.' with id: '.$id.' has been deleted.', '/'.$controllerName);
+			$this->controllerClass->flash('The '.Inflector::humanize($this->modelKey).' with id: '.$id.' has been deleted.', '/'.Inflector::underscore($this->controllerClass->viewPath));
 		}
 		else
 		{
-			$this->controllerClass->flash('There was an error deleting the '.$table.' with the id '.$id, '/'.$controllerName);
+			$this->controllerClass->flash('There was an error deleting the '.Inflector::humanize($this->modelKey).' with the id '.$id, '/'.Inflector::underscore($this->controllerClass->viewPath));
 		}
 	}
 	/**
@@ -268,46 +266,46 @@ class Scaffold extends Object {
 	function cleanUpFields()
 	{
 		//  clean up the date fields
-		$objModel = $this->controllerClass->models[$this->model];
+		$objModel = $this->controllerClass->models[$this->modelKey];
 		foreach( $objModel->_table_info as $table )
 		{
 			foreach ($table as $field)
 			{
-				if( 'date' == $field['type'] && isset($this->controllerClass->params['data'][$this->model][$field['name'].'_year'] ) )
+				if( 'date' == $field['type'] && isset($this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] ) )
 				{
 					$newDate = mktime( 0,0,0,
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_month'],
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_day'],
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_year'] );
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_month'],
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_day'],
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] );
 					$newDate = date( 'Y-m-d', $newDate );
-					$this->controllerClass->params['data'][$this->model][$field['name']] = $newDate;
+					$this->controllerClass->params['data'][$this->modelKey][$field['name']] = $newDate;
 				}
-				else if( 'datetime' == $field['type'] && isset($this->controllerClass->params['data'][$this->model][$field['name'].'_year'] ) )
+				else if( 'datetime' == $field['type'] && isset($this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] ) )
 				{
-					$hour = $this->controllerClass->params['data'][$this->model][$field['name'].'_hour'];
-					if( $hour != 12 && 'pm' == $this->controllerClass->params['data'][$this->model][$field['name'].'_meridian'] )
+					$hour = $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_hour'];
+					if( $hour != 12 && 'pm' == $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_meridian'] )
 					{
 						$hour = $hour + 12;
 					}
 					$newDate = mktime( $hour,
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_min'],
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_min'],
 					0,
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_month'],
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_day'],
-					$this->controllerClass->params['data'][$this->model][$field['name'].'_year'] );
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_month'],
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_day'],
+					$this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] );
 					$newDate = date( 'Y-m-d', $newDate );
-					$this->controllerClass->params['data'][$this->model][$field['name']] = $newDate;
+					$this->controllerClass->params['data'][$this->modelKey][$field['name']] = $newDate;
 				}
 				else if( 'tinyint(1)' == $field['type'] )
 				{
-					if( isset( $this->controllerClass->params['data'][$this->model][$field['name']]) &&
-					"on" == $this->controllerClass->params['data'][$this->model][$field['name']] )
+					if( isset( $this->controllerClass->params['data'][$this->modelKey][$field['name']]) &&
+					"on" == $this->controllerClass->params['data'][$this->modelKey][$field['name']] )
 					{
-						$this->controllerClass->params['data'][$this->model][$field['name']] = true;
+						$this->controllerClass->params['data'][$this->modelKey][$field['name']] = true;
 					}
 					else
 					{
-						$this->controllerClass->params['data'][$this->model][$field['name']] = false;
+						$this->controllerClass->params['data'][$this->modelKey][$field['name']] = false;
 					}
 				}
 			}
diff --git a/libs/view.php b/libs/view.php
index 7a321905e..e06b03051 100644
--- a/libs/view.php
+++ b/libs/view.php
@@ -2,9 +2,8 @@
 /* SVN FILE: $Id$ */
 
 /**
- * Short description for file.
+ * Methods for displaying presentation data
  * 
- * Long description for file
  *
  * PHP versions 4 and 5
  *
@@ -63,7 +62,7 @@ class View extends Object
    var $here = null;
 
 /**
- * Enter description here...
+ * Not used. 2005-09
  *
  * @var unknown_type
  * @access public
diff --git a/public/img/bg_fade.gif b/public/img/bg_fade.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2e9585083bd6827c9cc231d4eb03716c283f8211
GIT binary patch
literal 1147
zcmV->1cduXNk%w1VF3Uv0rvm^e29&ChKqTHig0~{Z+wDib$eN7Zc|}s<Ll~CU}sZe
zXx!!G<m~L=>FA4>o8s!}<?ZaDt*>8hbgZ_xlb@o%%FA48aBX^kg^`xn;NaQe;aFyE
zx52|@b9rZVdv}D1q_48W&CYRtgx==nkDH&!(b8IJZ*+l%S!i!lVrk*(>7S~sV{&(Y
zi;&pi;JCuWYIlCX$;*_Wq{h$CjG3Ln%gut1lf1>pRAOmXWov7Cf6CL;QDJ9QV`_wu
zmB`Z4pR28glb5-}#DR{J;OXbk+1a+i!knk7VQ_VnpQGaG=)cLz+T-Kj=;zDS)YsqN
zUTkyD*Vxb4*qEcIo2IJP-`~#I*rTnmY<YfTa(J@6zOlQ#sIs(ngNSl}h2H1paeste
zYjRd(Y_7Pw-{<G6wYQF%ot&tveTk3K+uBrPYRAygnWd*;Z*^*TeqL;Hc7%w%$H=3u
zu(ZFyS7mMG?CW4|b%v6bRb*;aWox>{#(as5Xm)&oj*^g^pyTZ8fQ^xZkCcIplAx@v
z)ZX2ep{2FJ!QJNOeu|IY=H;NPuCctnbAg80;^Erj;)|G^+T-He<Kx`q<lW`v%GA`$
z)YZ$?)oFNr-{<DN$jQFQ$z5!5U2Jo?#KoDVsMp}&nx?6BgNN4M-mkg5o~f)`YH-il
z*|xyJ<m>C<>FKh(zRJ_nv%SBEl$Wr&y{WXe)ZE;Ikd)Nj-Obk4&DPh=*Vm1jou#m|
z)!yE2dx5OCxmRXwj+&lia(HBOc#)o=uDH6cxx1>hwu+URs<pSl%FLXos@&w`ov5pl
zo}!18n0kkd(%Re6+1gZMYE@%vikF(k(9p!r&c)8pW^{UDaCT#Gc4KjOe~gf*w6$Mt
zbJ5z{h?JO#m6@iov!k!Ew7$U9+}&4YY;Aji<m~I1q^Hu`+|%3KQekIcZ*^K|ZpF{g
z!pzLV%+0*U$IR8$Rb*?u#>l(H#<|1Adx(s5frqBDw5PJPYk7WYcYKzjrkA3om7t`N
zoS=S-kg&SEA^8LV00000EC2ui0096j0RRa903kqNP=^6IRDTdCeDFYpl2i>E5NSdN
z)0Yt=5*?bfK+=L^ksvW~)JTH{7a1~qdQwFcE<&=x!8&Iy4YO^{ikOmOB}y$?v));%
z<b=|WRX<9USQBl=x@povglJcTU9k!kVl2^=DNa0hH{|K*G*8G24jhb}GBgJqD=n%P
zZE^K)RIo9?bWNC0hM2Hd*|^-Z=j|2<5Z~lni4b9sA|NYBAv<I22o+GC*p!>HPhTN^
zGLlfBknC4KKO{)-vSo(GBL@zk4eQ2DS*sv-FktWzE0B#LeFOo**1{hmG<yK-p|>nR
z009C%e1Ov>)QNg07<mCBLd1Xp1PJ6<8h7D>4lMZGz_^r;51#@aJW%V<!B?*=EUsCr
zhNMk8I}%8s4HR#1vPl?WSYSaZCYYcO3Md$0zy=%aLWejxh>-_8&*0I68qVO5f&vF9
NfDSr5B%oqI06S5@e`^2$

literal 0
HcmV?d00001

diff --git a/public/img/bg_header.gif b/public/img/bg_header.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1fb90c87473b2a7dd5ac6f8a444d336484fe98cd
GIT binary patch
literal 531
zcmd6k*G}9(07YkEVd=dDNGPHA5;{pJN$5YpAMgnjAt59rzKyaNyk_mO$J58-g0y+s
zK)!<ea39XY)sgPb-uCj!Q3{*`9{@zCPZ?&MazPm9O6e%lQ7nTXjANy>Pbd?TOU0xV
z>WxMoCa#YWCPFC{hDwJr&<;X~G9AaBj|t~O2Y1<rd&A5-uGTt?lbr3i2xG=>9}UZa
zQtM|cPlTXS+MX9BiF})iqO4)OxGsc{QhH}RWuHw<nPo#GXB7$s==;z^K^R7_uY`+7
zGe?C8lf*Plk5CsAGjBT{dT}5`ejd7(?bxnYEEd5>P2b=2f3=DCe*Xkyj!*W_mUb?B
z_bv~v4z{n?c5eonnz|Yro0|csu1=*E2TRiF&p%5`H)?9?>S}AtTI%a7D%wY?s@ht=
zH#C%&XEK$QUnhs=dluH0NB{H>&rW<={r#(>WNf_b%hYt|=8x`~t+{V~D~FVEArDW%
F+CRC1>{0*#

literal 0
HcmV?d00001

diff --git a/public/img/logo.png b/public/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9894d53975fe342aecf1a389b5fc1a03c91c145
GIT binary patch
literal 27968
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
U8j13e0LIVo>UG`E+PLWd1JGZO=l}o!

literal 0
HcmV?d00001

diff --git a/public/img/red_box.gif b/public/img/red_box.gif
new file mode 100644
index 0000000000000000000000000000000000000000..71001c19a701a02be020fea87cb0551791753f24
GIT binary patch
literal 45
ucmZ?wbhEHbWMN=oXkcJi#4W(Uz@Ye(1xPY5=zs{23<DEOOFt(ogEat_lm(&y

literal 0
HcmV?d00001

diff --git a/public/index.php b/public/index.php
index 3069ccfb7..94cd8a9c9 100644
--- a/public/index.php
+++ b/public/index.php
@@ -99,4 +99,4 @@ if (class_exists('DATABASE_CONFIG'))
 //CLEANUP
 if (DEBUG) echo "<!-- ". round(getMicrotime() - $TIME_START, 2) ."s -->";
 
-?>
+?>
\ No newline at end of file
diff --git a/tests/core/cases/libs/inflector.test.php b/tests/core/cases/libs/inflector.test.php
index 8bd5b45c9..e112504e3 100644
--- a/tests/core/cases/libs/inflector.test.php
+++ b/tests/core/cases/libs/inflector.test.php
@@ -29,7 +29,7 @@
  * @lastmodified $Date$
  * @license      http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
- 
+require_once LIBS.'inflectornew.php';
 /**
  * Short description for class.
  * 
@@ -39,6 +39,7 @@
  */
 class InflectorTest   extends UnitTestCase
 {
+    
 }
 
 ?>
\ No newline at end of file
diff --git a/vendors/simpletest/simple_test.php b/vendors/simpletest/simple_test.php
index 46a255997..35ab803b9 100644
--- a/vendors/simpletest/simple_test.php
+++ b/vendors/simpletest/simple_test.php
@@ -30,7 +30,15 @@
 	 *    @subpackage	UnitTester
      */
     class SimpleTestCase {
+    	/**
+    	  * @var string Name of the test.
+    	  * @access private
+    	  */
         var $_label = false;
+        /**
+          * @var SimpleRunner Test runner.
+          * @access private
+          */
         var $_runner = false;
 
         /**
@@ -536,6 +544,8 @@
          *    Sets the name of the test suite and error message.
          *    @param string $label    Name sent at the start and end
          *                            of the test.
+         *    @param string $error    
+         *                            
          *    @access public
          */
         function BadGroupTest($label, $error) {
