Merge from 3.2 branch.

Beginning of Prado 3.2 development

3 files changed, 83 insertions, 0 deletions

diff --git a/demos/chat/index_php.php b/demos/chat/index_php.php
new file mode 100644
index 00000000..88427e4a
--- /dev/null
+++ b/demos/chat/index_php.php
@@ -0,0 +1,27 @@
+<?php
+
+$frameworkPath='../../framework/prado.php';
+
+/** The directory checks may be removed if performance is required **/
+$basePath=dirname(__FILE__);
+$assetsPath=$basePath."/assets";
+$runtimePath=$basePath."/protected/runtime";
+
+$sqliteDbDir = $basePath."/protected/App_Code";
+$sqliteDb = $sqliteDbDir."/chat.db";
+
+if(!is_file($frameworkPath))
+	die("Unable to find prado framework path $frameworkPath.");
+if(!is_writable($assetsPath))
+	die("Please make sure that the directory $assetsPath is writable by Web server process.");
+if(!is_writable($runtimePath))
+	die("Please make sure that the directory $runtimePath is writable by Web server process.");
+if(!is_writable($sqliteDbDir))
+	die("Please make sure that the directory $sqliteDbDir is writable by Web server process.");
+if(!is_writable($sqliteDb))
+	die("Please make sure that the sqlite file $sqliteDb is writable by Web server process.");
+
+require_once($frameworkPath);
+
+$application=new TApplication('protected',false,TApplication::CONFIG_TYPE_PHP);
+$application->run();
\ No newline at end of file
diff --git a/demos/chat/protected/application.php b/demos/chat/protected/application.php
new file mode 100644
index 00000000..ae4e1d8c
--- /dev/null
+++ b/demos/chat/protected/application.php
@@ -0,0 +1,25 @@
+<?php
+return array(
+	'application' => array(
+		'id' => 'Chat',
+		'mode' => 'Debug'
+	),
+	'paths' => array(
+		'using'=>array(
+			'Application.App_Code.*',
+			'System.Data.*',
+			'System.Data.ActiveRecord.*',
+			'System.Security.*',
+			'System.Web.UI.ActiveControls.*',
+		),
+	),
+	'modules' => array(
+		'db' => array(
+			'class' => 'TActiveRecordConfig',
+			'properties' => array(
+				'EnableCache' => 'true',
+				'Database.ConnectionString'=>"sqlite:protected/App_Code/chat.db",
+			)
+		),
+	),
+);
\ No newline at end of file
diff --git a/demos/chat/protected/pages/config.php b/demos/chat/protected/pages/config.php
new file mode 100644
index 00000000..926bf150
--- /dev/null
+++ b/demos/chat/protected/pages/config.php
@@ -0,0 +1,31 @@
+<?php
+return array(
+	'modules' => array(
+		'users' => array(
+			'class' => 'ChatUserManager',
+		),
+		'auth' => array(
+			'class' => 'TAuthManager',
+			'properties' => array(
+				'UserManager' => 'users',
+				'LoginPage' => 'Login',
+			),
+		),
+	),
+	
+	'authorization' => array(
+		array(
+			'action' => 'allow',
+			'pages' => 'Login',
+			'users' => '?',
+		),
+		array(
+			'action' => 'allow',
+			'roles' => 'normal',
+		),
+		array(
+			'action' => 'deny',
+			'users' => '*',
+		),
+	),
+);
\ No newline at end of file