From bc3e745673385e0f48da3fa90cda5cc6fbaddf26 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Mon, 24 May 2010 22:24:58 -0300
Subject: [PATCH 1/6] Support to EHLO in SMTP server for EmailComponent. Fixes
 #54, #712, #737

---
 cake/libs/controller/components/email.php     | 16 ++++--
 .../libs/controller/components/email.test.php | 55 +++++++++++++++++++
 2 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 94ef82a3b..d18784abb 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -808,7 +808,7 @@ class EmailComponent extends Object{
 			$host = 'localhost';
 		}
 
-		if (!$this->_smtpSend("HELO {$host}", '250')) {
+		if (!$this->_smtpSend("EHLO {$host}", '250') || !$this->_smtpSend("HELO {$host}", '250')) {
 			return false;
 		}
 
@@ -868,22 +868,26 @@ class EmailComponent extends Object{
 	}
 
 /**
- * Private method for sending data to SMTP connection
+ * Protected method for sending data to SMTP connection
  *
  * @param string $data data to be sent to SMTP server
  * @param mixed $checkCode code to check for in server response, false to skip
  * @return bool Success
- * @access private
+ * @access protected
  */
 	function _smtpSend($data, $checkCode = '250') {
 		if (!is_null($data)) {
 			$this->__smtpConnection->write($data . "\r\n");
 		}
-		if ($checkCode !== false) {
+		while ($checkCode !== false) {
 			$response = $this->__smtpConnection->read();
+			$response = end(explode("\r\n", rtrim($response, "\r\n")));
 
-			if (preg_match('/^(' . $checkCode . ')/', $response, $code)) {
-				return $code[0];
+			if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) {
+				if ($code[2] === '-') {
+					continue;
+				}
+				return $code[1];
 			}
 			$this->smtpError = $response;
 			return false;
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 1267c96a7..f5de3e9d2 100755
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -295,6 +295,61 @@ TEMPDOC;
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 	}
 
+/**
+ * testSmtpEhlo method
+ *
+ * @access public
+ * @return void
+ */
+	function testSmtpEhlo() {
+		if (!$this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+
+		$connection =& new CakeSocket(array('protocol'=>'smtp', 'host' => 'localhost', 'port' => 25));
+		$this->Controller->EmailTest->setConnectionSocket($connection);
+		$this->assertTrue($connection->connect());
+		$this->assertTrue($this->Controller->EmailTest->smtpSend(null, '220') !== false);
+		$this->skipIf($this->Controller->EmailTest->smtpSend('EHLO locahost', '250') === false, '%s do not support EHLO.');
+		$connection->disconnect();
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+
+		$this->Controller->EmailTest->_debug = true;
+		$this->Controller->EmailTest->sendAs = 'text';
+		$expect = <<<TEMPDOC
+<pre>Host: localhost
+Port: 25
+Timeout: 30
+To: postmaster@localhost
+From: noreply@example.com
+Subject: Cake SMTP test
+Header:
+
+To: postmaster@localhost
+From: noreply@example.com
+Reply-To: noreply@example.com
+Subject: Cake SMTP test
+X-Mailer: CakePHP Email Component
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 7bitParameters:
+
+Message:
+
+This is the body of the message
+
+</pre>
+TEMPDOC;
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+	}
 
 /**
  * testSmtpSendMultipleTo method

From 64adfacd3ec9ef11c9c29218e972059bdb6be9f7 Mon Sep 17 00:00:00 2001
From: Martin Radosta <mradosta@pragmatia.com>
Date: Wed, 19 May 2010 05:54:51 -0300
Subject: [PATCH 2/6] Making DboSource::order() accept an expression object.
 Fixes issues with sql parsing over quoting special SQL syntax. Tests added. 
 Fixes #747

Signed-off-by: mark_story <mark@mark-story.com>
---
 cake/libs/model/datasources/dbo_source.php          |  3 +++
 .../libs/model/datasources/dbo_source.test.php      | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index db5dca354..4bd56e849 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -2411,6 +2411,9 @@ class DboSource extends DataSource {
 					}
 				}
 				continue;
+			} elseif (is_object($key) && isset($key->type) && $key->type === 'expression') {
+				$result[] = $key->value;
+				continue;
 			}
 
 			if (preg_match('/\\x20(ASC|DESC).*/i', $key, $_dir)) {
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index ead5a9d7b..73f86be55 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -2966,6 +2966,19 @@ class DboSourceTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
+/**
+ * test that order() will accept objects made from DboSource::expression
+ *
+ * @return void
+ */
+	function testOrderWithExpression() {
+		$expression = $this->testDb->expression("CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col");
+		$result = $this->testDb->order($expression);
+		$expected = " ORDER BY CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col";
+		$this->assertEqual($result, $expected);
+	}
+
 /**
  * testMergeAssociations method
  *

From 8b6c974cd0879228a5f9363450763eeaf71963cd Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 27 May 2010 00:01:17 -0400
Subject: [PATCH 3/6] Making FileEngine not greedily clear files in a directory
 that may belong to another cache configuration.  Tests added. Fixes #754

---
 cake/libs/cache/file.php                  |  4 ++++
 cake/tests/cases/libs/cache/file.test.php | 28 +++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index e8e8ffdad..3494c62ce 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -209,7 +209,11 @@ class FileEngine extends CacheEngine {
 			$now = time();
 			$threshold = $now - $this->settings['duration'];
 		}
+		$prefixLength = strlen($this->settings['prefix']);
 		while (($entry = $dir->read()) !== false) {
+			if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
+				continue;
+			}
 			if ($this->_setKey($entry) === false) {
 				continue;
 			}
diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 15ee52673..ffb571f73 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -273,6 +273,34 @@ class FileEngineTest extends CakeTestCase {
 		Cache::config('default', array('engine' => 'File', 'path' => CACHE));
 	}
 
+/**
+ * test that clear() doesn't wipe files not in the current engine's prefix.
+ *
+ * @return void
+ */
+	function testClearWithPrefixes() {
+		$FileOne =& new FileEngine();
+		$FileOne->init(array(
+			'prefix' => 'prefix_one_',
+			'duration' => DAY
+		));
+		$FileTwo =& new FileEngine();
+		$FileTwo->init(array(
+			'prefix' => 'prefix_two_',
+			'duration' => DAY
+		));
+
+		$data1 = $data2 = $expected = 'content to cache';
+		$FileOne->write('key_one', $data1, DAY);
+		$FileTwo->write('key_two', $data2, DAY);
+
+		$this->assertEqual($FileOne->read('key_one'), $expected);
+		$this->assertEqual($FileTwo->read('key_two'), $expected);
+
+		$FileOne->clear(false);
+		$this->assertEqual($FileTwo->read('key_two'), $expected, 'secondary config was cleared by accident.');
+	}
+
 /**
  * testKeyPath method
  *

From e02cb81a6707332bf01d8268a0073ae47d8c228f Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Sat, 29 May 2010 12:04:29 -0300
Subject: [PATCH 4/6] Reading a smtp response until EOL. Fixes #378

---
 cake/libs/controller/components/email.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index d18784abb..5ee9f531f 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -880,7 +880,15 @@ class EmailComponent extends Object{
 			$this->__smtpConnection->write($data . "\r\n");
 		}
 		while ($checkCode !== false) {
-			$response = $this->__smtpConnection->read();
+			$response = '';
+			$startTime = time();
+			while (substr($response, -2) !== "\r\n" && ((time() - $startTime) < $this->smtpOptions['timeout'])) {
+				$response .= $this->__smtpConnection->read();
+			}
+			if (substr($response, -2) === "\r\n") {
+				$this->smtpError = 'timeout';
+				return false;
+			}
 			$response = end(explode("\r\n", rtrim($response, "\r\n")));
 
 			if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) {

From f06f0dae8be7be2cf6ed571d5e46c58959814f53 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sun, 30 May 2010 01:10:48 +1000
Subject: [PATCH 5/6] Numerous "Enter description here" block comments updated
 to have meaningful descriptions.

---
 app/webroot/css.php                           | 10 ++--
 cake/console/templates/skel/webroot/css.php   |  6 +--
 cake/libs/model/datasources/datasource.php    |  2 +-
 cake/libs/model/datasources/dbo/dbo_mysql.php |  4 +-
 .../libs/model/datasources/dbo/dbo_mysqli.php |  4 +-
 .../libs/model/datasources/dbo/dbo_oracle.php | 46 +++++++++----------
 .../libs/model/datasources/dbo/dbo_sqlite.php |  4 +-
 cake/libs/view/helpers/number.php             |  2 +-
 8 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/app/webroot/css.php b/app/webroot/css.php
index 445b2fb2e..aae68cba8 100644
--- a/app/webroot/css.php
+++ b/app/webroot/css.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * CSS helping functions
  *
  * PHP versions 4 and 5
  *
@@ -21,14 +21,16 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	header('HTTP/1.1 404 Not Found');
 	exit('File Not Found');
 }
+
 /**
- * Enter description here...
+ * Ensure required classes are available.
  */
 if (!class_exists('File')) {
 	uses('file');
 }
+
 /**
- * Enter description here...
+ * Make clean CSS
  *
  * @param unknown_type $path
  * @param unknown_type $name
@@ -44,7 +46,7 @@ if (!class_exists('File')) {
 		return $output;
 	}
 /**
- * Enter description here...
+ * Write CSS cache
  *
  * @param unknown_type $path
  * @param unknown_type $content
diff --git a/cake/console/templates/skel/webroot/css.php b/cake/console/templates/skel/webroot/css.php
index 464f20987..83dc90a72 100644
--- a/cake/console/templates/skel/webroot/css.php
+++ b/cake/console/templates/skel/webroot/css.php
@@ -23,14 +23,14 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 }
 
 /**
- * Enter description here...
+ * Ensure required files are included
  */
 if (!class_exists('File')) {
 	require LIBS . 'file.php';
 }
 
 /**
- * Enter description here...
+ * Make clean CSS
  *
  * @param unknown_type $path
  * @param unknown_type $name
@@ -47,7 +47,7 @@ if (!class_exists('File')) {
 	}
 
 /**
- * Enter description here...
+ * Write CSS cache
  *
  * @param unknown_type $path
  * @param unknown_type $content
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index ab45610b1..2c5a0ab12 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -91,7 +91,7 @@ class DataSource extends Object {
 	var $endQuote = null;
 
 /**
- * Enter description here...
+ * Result
  *
  * @var array
  * @access protected
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index d06d71830..731e14e70 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -507,9 +507,9 @@ class DboMysqlBase extends DboSource {
 class DboMysql extends DboMysqlBase {
 
 /**
- * Enter description here...
+ * Datasource description
  *
- * @var unknown_type
+ * @var string
  */
 	var $description = "MySQL DBO Driver";
 
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index d42b10eda..daf47f557 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -30,9 +30,9 @@ App::import('Datasource', 'DboMysql');
 class DboMysqli extends DboMysqlBase {
 
 /**
- * Enter description here...
+ * Datasource Description
  *
- * @var unknown_type
+ * @var string
  */
 	var $description = "Mysqli DBO Driver";
 
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 9c78d4f75..b8ee083fa 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -29,17 +29,17 @@
 class DboOracle extends DboSource {
 
 /**
- * Enter description here...
+ * Configuration options
  *
- * @var unknown_type
+ * @var array
  * @access public
  */
 	var $config = array();
 
 /**
- * Enter description here...
+ * Alias
  *
- * @var unknown_type
+ * @var string
  */
 	var $alias = '';
 
@@ -56,9 +56,9 @@ class DboOracle extends DboSource {
 	var $__transactionStarted = false;
 
 /**
- * Enter description here...
+ * Column definitions
  *
- * @var unknown_type
+ * @var array
  * @access public
  */
 	var $columns = array(
@@ -77,25 +77,25 @@ class DboOracle extends DboSource {
 		'inet' => array('name' => 'inet'));
 
 /**
- * Enter description here...
+ * Connection object
  *
- * @var unknown_type
+ * @var mixed
  * @access protected
  */
 	var $connection;
 
 /**
- * Enter description here...
+ * Query limit
  *
- * @var unknown_type
+ * @var int
  * @access protected
  */
 	var $_limit = -1;
 
 /**
- * Enter description here...
+ * Query offset
  *
- * @var unknown_type
+ * @var int
  * @access protected
  */
 	var $_offset = 0;
@@ -109,25 +109,25 @@ class DboOracle extends DboSource {
 	var $_map;
 
 /**
- * Enter description here...
+ * Current Row
  *
- * @var unknown_type
+ * @var mixed
  * @access protected
  */
 	var $_currentRow;
 
 /**
- * Enter description here...
+ * Number of rows
  *
- * @var unknown_type
+ * @var int
  * @access protected
  */
 	var $_numRows;
 
 /**
- * Enter description here...
+ * Query results
  *
- * @var unknown_type
+ * @var mixed
  * @access protected
  */
 	var $_results;
@@ -378,9 +378,9 @@ class DboOracle extends DboSource {
 	}
 
 /**
- * Enter description here...
+ * Fetch result row
  *
- * @return unknown
+ * @return array
  * @access public
  */
 	function fetchRow() {
@@ -444,10 +444,10 @@ class DboOracle extends DboSource {
 	}
 
 /**
- * Enter description here...
+ * Create trigger
  *
- * @param unknown_type $table
- * @return unknown
+ * @param string $table
+ * @return mixed
  * @access public
  */
 	function createTrigger($table) {
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 1fdba32a8..efc660f33 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -29,9 +29,9 @@
 class DboSqlite extends DboSource {
 
 /**
- * Enter description here...
+ * Datasource Description
  *
- * @var unknown_type
+ * @var string
  */
 	var $description = "SQLite DBO Driver";
 
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index da8a565a6..236732a92 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -69,7 +69,7 @@ class NumberHelper extends AppHelper {
  *
  * @param float $number	A floating point number.
  * @param integer $precision The precision of the returned number.
- * @return float Enter description here...
+ * @return float Formatted float.
  * @access public
  * @link http://book.cakephp.org/view/1454/precision
  */

From 8decc683ac46f5f00e026ef2cbeb4873330f3e2e Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sun, 30 May 2010 01:20:28 +1000
Subject: [PATCH 6/6] Numerous 'shoer description' documentation entries
 updated to contain useful comments.

---
 cake/console/libs/console.php                            | 2 +-
 cake/console/libs/i18n.php                               | 2 +-
 cake/console/templates/skel/app_controller.php           | 4 ++--
 cake/console/templates/skel/app_helper.php               | 2 +-
 cake/console/templates/skel/config/acl.ini.php           | 2 +-
 cake/console/templates/skel/config/routes.php            | 2 +-
 cake/console/templates/skel/webroot/css.php              | 2 +-
 cake/libs/controller/app_controller.php                  | 2 +-
 cake/libs/controller/components/cookie.php               | 2 +-
 cake/libs/controller/components/email.php                | 2 +-
 cake/libs/controller/components/security.php             | 5 +++--
 cake/libs/i18n.php                                       | 2 +-
 cake/libs/l10n.php                                       | 4 ++--
 cake/libs/model/behaviors/acl.php                        | 2 +-
 cake/libs/model/behaviors/translate.php                  | 4 ++--
 cake/libs/model/datasources/dbo/dbo_mssql.php            | 2 +-
 cake/libs/model/datasources/dbo/dbo_oracle.php           | 2 +-
 cake/libs/model/datasources/dbo_source.php               | 2 +-
 cake/libs/model/db_acl.php                               | 2 +-
 cake/libs/security.php                                   | 2 +-
 cake/libs/view/helpers/app_helper.php                    | 2 +-
 cake/tests/cases/libs/controller/components/acl.test.php | 2 +-
 22 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index 41e4d4634..ac7b595bb 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * CakePHP Console Shell
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php
index ad41ec148..bdfa378fb 100644
--- a/cake/console/libs/i18n.php
+++ b/cake/console/libs/i18n.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Internationalization Management Shell
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/console/templates/skel/app_controller.php b/cake/console/templates/skel/app_controller.php
index a1f50257d..c9f09fca0 100644
--- a/cake/console/templates/skel/app_controller.php
+++ b/cake/console/templates/skel/app_controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Application level Controller
  *
  * This file is application-wide controller file. You can put all
  * application-wide controller-related methods here.
@@ -22,7 +22,7 @@
  */
 
 /**
- * Short description for class.
+ * Application Controller
  *
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
diff --git a/cake/console/templates/skel/app_helper.php b/cake/console/templates/skel/app_helper.php
index 9eb974e9e..a64d3cb85 100644
--- a/cake/console/templates/skel/app_helper.php
+++ b/cake/console/templates/skel/app_helper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Application level View Helper
  *
  * This file is application-wide helper file. You can put all
  * application-wide helper-related methods here.
diff --git a/cake/console/templates/skel/config/acl.ini.php b/cake/console/templates/skel/config/acl.ini.php
index 9a4e5c9fc..075449856 100644
--- a/cake/console/templates/skel/config/acl.ini.php
+++ b/cake/console/templates/skel/config/acl.ini.php
@@ -1,7 +1,7 @@
 ;<?php exit() ?>
 ; SVN FILE: $Id$
 ;/**
-; * Short description for file.
+; * ACL Configuration
 ; *
 ; *
 ; * PHP versions 4 and 5
diff --git a/cake/console/templates/skel/config/routes.php b/cake/console/templates/skel/config/routes.php
index 696c49a87..9e4a28c14 100644
--- a/cake/console/templates/skel/config/routes.php
+++ b/cake/console/templates/skel/config/routes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Routes Configuration
  *
  * In this file, you set up routes to your controllers and their actions.
  * Routes are very important mechanism that allows you to freely connect
diff --git a/cake/console/templates/skel/webroot/css.php b/cake/console/templates/skel/webroot/css.php
index 83dc90a72..1f04005de 100644
--- a/cake/console/templates/skel/webroot/css.php
+++ b/cake/console/templates/skel/webroot/css.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * CSS Functions
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php
index e2a8302c5..073c6405e 100644
--- a/cake/libs/controller/app_controller.php
+++ b/cake/libs/controller/app_controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Application level Controller
  *
  * This file is application-wide controller file. You can put all
  * application-wide controller-related methods here.
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index f5ec59f36..67c3fe4db 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Cookie Component
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 5ee9f531f..202f45384 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Email Component
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 65c00e630..67f83ff52 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Security Component
  *
  * PHP versions 4 and 5
  *
@@ -18,8 +18,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Core', array('String', 'Security'));
+
 /**
- * Short description for file.
+ * SecurityComponent
  *
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 63f0c80f8..b775223bd 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Internationalization
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 2ec65bbb8..801112e82 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Localization
  *
  * PHP versions 4 and 5
  *
@@ -19,7 +19,7 @@
  */
 
 /**
- * Short description for file.
+ * Localization
  *
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index e1413916e..f044bf42b 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -21,7 +21,7 @@
  */
 
 /**
- * Short description for file
+ * ACL behavior
  *
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index 53fba8386..39393015d 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Translate behavior
  *
  * PHP versions 4 and 5
  *
@@ -19,7 +19,7 @@
  */
 
 /**
- * Short description for file.
+ * Translate behavior
  *
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 8ea2e613d..b7b17f7c8 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * Short description for class.
+ * MS SQL layer for DBO
  *
  * Long description for class
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index b8ee083fa..38fb03382 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * Short description for class.
+ * Oracle layer for DBO.
  *
  * Long description for class
  *
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 4bd56e849..128b0c309 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Dbo Source
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index 5dba318f8..245e10b0b 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -26,7 +26,7 @@
 App::import('Model', 'App');
 
 /**
- * Short description for file.
+ * ACL Node
  *
  *
  * @package       cake
diff --git a/cake/libs/security.php b/cake/libs/security.php
index b7c5f520b..4020b83ac 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Core Security
  *
  * PHP versions 4 and 5
  *
diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php
index 57064f72d..deed26a02 100644
--- a/cake/libs/view/helpers/app_helper.php
+++ b/cake/libs/view/helpers/app_helper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Short description for file.
+ * Application level View Helper
  *
  * This file is application-wide helper file. You can put all
  * application-wide helper-related methods here.
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php
index 11faa3aa2..a1f12c6df 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/cake/tests/cases/libs/controller/components/acl.test.php
@@ -194,7 +194,7 @@ class IniAclTest extends IniAcl {
 }
 
 /**
- * Short description for class.
+ * ACL Component Text case
  *
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components