Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

30 files changed, 3 insertions, 33 deletions

diff --git a/demos/blog/protected/Common/BlogDataModule.php b/demos/blog/protected/Common/BlogDataModule.php
index a6312dcb..384ee83d 100755
--- a/demos/blog/protected/Common/BlogDataModule.php
+++ b/demos/blog/protected/Common/BlogDataModule.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: BlogDataModule.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
@@ -236,7 +235,7 @@ class BlogDataModule extends TModule
 
 	public function queryPosts($postFilter,$categoryFilter,$orderBy,$limit)
 	{
-		//FIXME this is insecure by design since it misses proper escaping 
+		//FIXME this is insecure by design since it misses proper escaping
 		$filter='';
 		if($postFilter!=='')
 			$filter.=" AND $postFilter";
@@ -301,7 +300,7 @@ class BlogDataModule extends TModule
 
 	public function queryPostCount($postFilter,$categoryFilter)
 	{
-		//FIXME this is insecure by design since it misses proper escaping 
+		//FIXME this is insecure by design since it misses proper escaping
 		$filter='';
 		if($postFilter!=='')
 			$filter.=" AND $postFilter";
@@ -424,7 +423,7 @@ class BlogDataModule extends TModule
 
 	public function queryComments($filter,$orderBy,$limit)
 	{
-		//FIXME this is insecure by design since it misses proper escaping 
+		//FIXME this is insecure by design since it misses proper escaping
 		if($filter!=='')
 			$filter='WHERE '.$filter;
 		$sql="SELECT * FROM tblComments $filter $orderBy $limit";
diff --git a/demos/blog/protected/Common/BlogErrorHandler.php b/demos/blog/protected/Common/BlogErrorHandler.php
index fd5a7044..5446a5ee 100755
--- a/demos/blog/protected/Common/BlogErrorHandler.php
+++ b/demos/blog/protected/Common/BlogErrorHandler.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: BlogErrorHandler.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('System.Exceptions.TErrorHandler');
diff --git a/demos/blog/protected/Common/BlogException.php b/demos/blog/protected/Common/BlogException.php
index 39825f4f..e857cc3d 100755
--- a/demos/blog/protected/Common/BlogException.php
+++ b/demos/blog/protected/Common/BlogException.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: BlogException.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Common/BlogPage.php b/demos/blog/protected/Common/BlogPage.php
index e6da9a8c..2c394e46 100755
--- a/demos/blog/protected/Common/BlogPage.php
+++ b/demos/blog/protected/Common/BlogPage.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: BlogPage.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Common/BlogUser.php b/demos/blog/protected/Common/BlogUser.php
index 93990f69..3ce8af1b 100755
--- a/demos/blog/protected/Common/BlogUser.php
+++ b/demos/blog/protected/Common/BlogUser.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: BlogUser.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('System.Security.TUser');
diff --git a/demos/blog/protected/Common/BlogUserManager.php b/demos/blog/protected/Common/BlogUserManager.php
index 898402fa..c9419d73 100755
--- a/demos/blog/protected/Common/BlogUserManager.php
+++ b/demos/blog/protected/Common/BlogUserManager.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: BlogUserManager.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('System.Security.IUserManager');
diff --git a/demos/blog/protected/Common/XListMenu.php b/demos/blog/protected/Common/XListMenu.php
index a3ad4308..5289167f 100755
--- a/demos/blog/protected/Common/XListMenu.php
+++ b/demos/blog/protected/Common/XListMenu.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: XListMenu.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('System.Web.UI.WebControls.TListControl');
diff --git a/demos/blog/protected/Layouts/MainLayout.php b/demos/blog/protected/Layouts/MainLayout.php
index c2fbe04c..618691a1 100755
--- a/demos/blog/protected/Layouts/MainLayout.php
+++ b/demos/blog/protected/Layouts/MainLayout.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: MainLayout.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Admin/AdminMenu.php b/demos/blog/protected/Pages/Admin/AdminMenu.php
index f4c89724..01ca60c0 100755
--- a/demos/blog/protected/Pages/Admin/AdminMenu.php
+++ b/demos/blog/protected/Pages/Admin/AdminMenu.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: AdminMenu.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.php b/demos/blog/protected/Pages/Admin/ConfigMan.php
index be5e3983..4a938c94 100755
--- a/demos/blog/protected/Pages/Admin/ConfigMan.php
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: ConfigMan.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Admin/PostMan.php b/demos/blog/protected/Pages/Admin/PostMan.php
index 9fa6b7d4..c69788c1 100755
--- a/demos/blog/protected/Pages/Admin/PostMan.php
+++ b/demos/blog/protected/Pages/Admin/PostMan.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: PostMan.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Admin/UserMan.php b/demos/blog/protected/Pages/Admin/UserMan.php
index 44fd2fc7..de3f7065 100755
--- a/demos/blog/protected/Pages/Admin/UserMan.php
+++ b/demos/blog/protected/Pages/Admin/UserMan.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: UserMan.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/ErrorReport.php b/demos/blog/protected/Pages/ErrorReport.php
index dc92c887..e8614943 100755
--- a/demos/blog/protected/Pages/ErrorReport.php
+++ b/demos/blog/protected/Pages/ErrorReport.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: ErrorReport.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/EditCategory.php b/demos/blog/protected/Pages/Posts/EditCategory.php
index 67c03204..01beee7f 100755
--- a/demos/blog/protected/Pages/Posts/EditCategory.php
+++ b/demos/blog/protected/Pages/Posts/EditCategory.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: EditCategory.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/EditPost.php b/demos/blog/protected/Pages/Posts/EditPost.php
index 7345a3cc..d2cc119b 100755
--- a/demos/blog/protected/Pages/Posts/EditPost.php
+++ b/demos/blog/protected/Pages/Posts/EditPost.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: EditPost.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/ListPost.php b/demos/blog/protected/Pages/Posts/ListPost.php
index eba9f675..51e581d3 100755
--- a/demos/blog/protected/Pages/Posts/ListPost.php
+++ b/demos/blog/protected/Pages/Posts/ListPost.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: ListPost.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/MyPost.php b/demos/blog/protected/Pages/Posts/MyPost.php
index e1851772..c0724f92 100755
--- a/demos/blog/protected/Pages/Posts/MyPost.php
+++ b/demos/blog/protected/Pages/Posts/MyPost.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: MyPost.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/NewCategory.php b/demos/blog/protected/Pages/Posts/NewCategory.php
index 98eba96d..3043d657 100755
--- a/demos/blog/protected/Pages/Posts/NewCategory.php
+++ b/demos/blog/protected/Pages/Posts/NewCategory.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: NewCategory.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/NewPost.php b/demos/blog/protected/Pages/Posts/NewPost.php
index c1127547..d4e2f855 100755
--- a/demos/blog/protected/Pages/Posts/NewPost.php
+++ b/demos/blog/protected/Pages/Posts/NewPost.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: NewPost.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Posts/ViewPost.php b/demos/blog/protected/Pages/Posts/ViewPost.php
index 05890794..3c549673 100755
--- a/demos/blog/protected/Pages/Posts/ViewPost.php
+++ b/demos/blog/protected/Pages/Posts/ViewPost.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: ViewPost.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Users/EditUser.php b/demos/blog/protected/Pages/Users/EditUser.php
index 862539f9..e3e2e1b0 100755
--- a/demos/blog/protected/Pages/Users/EditUser.php
+++ b/demos/blog/protected/Pages/Users/EditUser.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: EditUser.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Users/NewUser.php b/demos/blog/protected/Pages/Users/NewUser.php
index 24932f03..f407c44b 100755
--- a/demos/blog/protected/Pages/Users/NewUser.php
+++ b/demos/blog/protected/Pages/Users/NewUser.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: NewUser.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Pages/Users/ViewUser.php b/demos/blog/protected/Pages/Users/ViewUser.php
index 671e2c0a..61e4c689 100755
--- a/demos/blog/protected/Pages/Users/ViewUser.php
+++ b/demos/blog/protected/Pages/Users/ViewUser.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: ViewUser.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Portlets/AccountPortlet.php b/demos/blog/protected/Portlets/AccountPortlet.php
index 89a2294f..1ef0b820 100755
--- a/demos/blog/protected/Portlets/AccountPortlet.php
+++ b/demos/blog/protected/Portlets/AccountPortlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: AccountPortlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('Application.Portlets.Portlet');
diff --git a/demos/blog/protected/Portlets/ArchivePortlet.php b/demos/blog/protected/Portlets/ArchivePortlet.php
index 9deb36f1..858b6b3f 100755
--- a/demos/blog/protected/Portlets/ArchivePortlet.php
+++ b/demos/blog/protected/Portlets/ArchivePortlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: ArchivePortlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('Application.Portlets.Portlet');
diff --git a/demos/blog/protected/Portlets/CategoryPortlet.php b/demos/blog/protected/Portlets/CategoryPortlet.php
index df243df3..c5ed10d3 100755
--- a/demos/blog/protected/Portlets/CategoryPortlet.php
+++ b/demos/blog/protected/Portlets/CategoryPortlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: CategoryPortlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('Application.Portlets.Portlet');
diff --git a/demos/blog/protected/Portlets/CommentPortlet.php b/demos/blog/protected/Portlets/CommentPortlet.php
index df07fb1e..6225ff45 100755
--- a/demos/blog/protected/Portlets/CommentPortlet.php
+++ b/demos/blog/protected/Portlets/CommentPortlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: CommentPortlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('Application.Portlets.Portlet');
diff --git a/demos/blog/protected/Portlets/LoginPortlet.php b/demos/blog/protected/Portlets/LoginPortlet.php
index 8b118390..de48363e 100755
--- a/demos/blog/protected/Portlets/LoginPortlet.php
+++ b/demos/blog/protected/Portlets/LoginPortlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: LoginPortlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('Application.Portlets.Portlet');
diff --git a/demos/blog/protected/Portlets/Portlet.php b/demos/blog/protected/Portlets/Portlet.php
index 0df8ce2e..ae1b04c1 100755
--- a/demos/blog/protected/Portlets/Portlet.php
+++ b/demos/blog/protected/Portlets/Portlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: Portlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 /**
diff --git a/demos/blog/protected/Portlets/SearchPortlet.php b/demos/blog/protected/Portlets/SearchPortlet.php
index 018ad883..9c6646a8 100755
--- a/demos/blog/protected/Portlets/SearchPortlet.php
+++ b/demos/blog/protected/Portlets/SearchPortlet.php
@@ -6,7 +6,6 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2006 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: SearchPortlet.php 3189 2012-07-12 12:16:21Z ctrlaltca $
  */
 
 Prado::using('Application.Portlets.Portlet');