Merge from 3.2 branch.

Beginning of Prado 3.2 development

4 files changed, 132 insertions, 0 deletions

diff --git a/demos/blog/protected/Data/Settings.php b/demos/blog/protected/Data/Settings.php
new file mode 100644
index 00000000..a4adcd9f
--- /dev/null
+++ b/demos/blog/protected/Data/Settings.php
@@ -0,0 +1,13 @@
+<?php
+return array(
+	'SiteTitle' => 'MyBlog',
+	'SiteSubtitle' => 'A Prado-driven weblog',
+	'SiteOwner' => 'Prado User',
+	'AdminEmail' => 'admin@example.com',
+	'MultipleUser' => false,
+	'AccountApproval' => false,
+	'PostPerPage' => 6,
+	'RecentComments' => 6,
+	'PostApproval' => false,
+	'ThemeName' => 'Winter'
+);
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/config.php b/demos/blog/protected/Pages/Admin/config.php
new file mode 100644
index 00000000..d392da4e
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/config.php
@@ -0,0 +1,13 @@
+<?php
+return array(
+	'authorization' => array(
+		array(
+			'action' => 'allow',
+			'roles' => 'admin',
+		),
+		array(
+			'action' => 'deny',
+			'users' => '*',
+		),
+	),
+);
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Posts/config.php b/demos/blog/protected/Pages/Posts/config.php
new file mode 100644
index 00000000..8af0dd56
--- /dev/null
+++ b/demos/blog/protected/Pages/Posts/config.php
@@ -0,0 +1,20 @@
+<?php
+return array(
+	'authorization' => array(
+		array(
+			'action' => 'deny',
+			'pages' => 'EditPost,NewPost,MyPost',
+			'users' => '?',
+		),
+		array(
+			'action' => 'allow',
+			'pages' => 'NewCategory,EditCategory',
+			'users' => 'admin',
+		),
+		array(
+			'action' => 'deny',
+			'pages' => 'NewCategory,EditCategory',
+			'users' => '*',
+		),
+	)
+);
\ No newline at end of file
diff --git a/demos/blog/protected/application.php b/demos/blog/protected/application.php
new file mode 100644
index 00000000..d7d7c97b
--- /dev/null
+++ b/demos/blog/protected/application.php
@@ -0,0 +1,86 @@
+<?php
+return array(
+	'application' => array(
+		'id' => 'blog',
+		'mode' => 'Debug'
+	),
+	'paths' => array(
+		'using' => array(
+			'Application.Common.*',
+		),
+	),
+	// Modules configured and loaded for all services
+	'modules' => array(
+		'request' => array(
+			'class' => 'THttpRequest',
+			'properties' => array(
+				'UrlFormat' => 'Path',
+				'UrlManager' => 'friendly-url',
+			),
+		),
+		
+		'cache' => array(
+			'class' => 'System.Caching.TSqliteCache',
+		),
+		
+		'error' => array(
+			'class' => 'Application.Common.BlogErrorHandler',
+		),
+		array(
+			'class' => 'System.Util.TLogRouter',
+			'routes' => array(
+				array(
+					'class' => 'TFileLogRoute',
+					'properties' => array(
+						'Categories' => 'BlogApplication',
+					),
+				),
+			),
+		),
+		array(
+			'class' => 'System.Util.TParameterModule',
+			'properties' => array(
+				'ParameterFile' => 'Application.Data.Settings',
+			),
+		),
+		'friendly-url' => array(
+			'class' => 'System.Web.TUrlMapping',
+			'properties' => array(
+				'EnableCustomUrl' => true,
+			),
+			'urls' => array(
+				array('properties' => array('ServiceParameter'=>'Posts.ViewPost','pattern'=>'post/{id}/?','parameters.id'=>'\d+')),
+			),
+		),
+	),
+	'services' => array(
+		'page' => array(
+			'class' => 'TPageService',
+			'properties' => array(
+				'BasePath' => 'Application.Pages',
+				'DefaultPage' => 'Posts.ListPost',
+			),
+			'modules' => array(
+				'users' => array(
+					'class' => 'Application.Common.BlogUserManager',
+				),
+				'auth' => array(
+					'class' => 'System.Security.TAuthManager',
+					'properties' => array(
+						'UserManager' => 'users',
+						'LoginPage' => 'Posts.ListPost',
+					),
+				),
+				'data' => array(
+					'class' => 'Application.Common.BlogDataModule',
+				),
+			),
+			'pages' => array(
+				'properties' => array(
+					'MasterClass' => 'Application.Layouts.MainLayout',
+					'Theme' => 'Basic',
+				),
+			),
+		),
+	),
+);
\ No newline at end of file