Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.de

4 files changed, 38 insertions, 8 deletions

diff --git a/protected/config/maincfg.php b/protected/config/maincfg.php
index b5fed17..7106a79 100644
--- a/protected/config/maincfg.php
+++ b/protected/config/maincfg.php
@@ -20,7 +20,9 @@ return array(
 		'application.components.*',
 		'application.extensions.egmap.*',
 		'application.modules.auditTrail.models.AuditTrail',
-        'application.extensions.yii-mail.YiiMailMessage'
+        'application.extensions.yii-mail.YiiMailMessage',
+		'application.modules.cms.models.*',
+		'application.extensions.extckeditor.*',
 	),
 
 	'modules'=>array(
@@ -36,6 +38,10 @@ return array(
 				'userIdColumn' => 'id', // the column name of the primary key for the user
 				'userNameColumn' => 'username', // the column name of the primary key for the user
 		),
+		'cms' => array(

+					'languages' => array('de','en'), // place all valid languages here

+					'layout' => '//layouts/column2',

+			),
 	),
 
 	// application components
diff --git a/protected/modules/cms/controllers/DefaultController.php b/protected/modules/cms/controllers/DefaultController.php
index b76d17b..e98d8cc 100644
--- a/protected/modules/cms/controllers/DefaultController.php
+++ b/protected/modules/cms/controllers/DefaultController.php
@@ -2,6 +2,19 @@
 
 class DefaultController extends Controller
 {
+	public function accessRules()

+	{

+		return array(

+				array('deny',

+						'actions'=>array('*'),

+						'users'=>array('*'),

+				),

+				array('allow',

+						'actions'=>array('*'),

+						'roles'=>array('admin'),

+				)

+		);

+	}
 	public function beforeAction($action)
 	{
 		$this->layout = Yii::app()->controller->module->layout;
@@ -16,5 +29,11 @@ class DefaultController extends Controller
 	{
 		$this->render('admin');	
 	}
+	public function filters()

+	{

+		return array(

+				'accessControl', // perform access control for CRUD operations

+		);

+	}
 
 }
diff --git a/protected/modules/cms/controllers/SitecontentController.php b/protected/modules/cms/controllers/SitecontentController.php
index 72dde78..448d6a6 100644
--- a/protected/modules/cms/controllers/SitecontentController.php
+++ b/protected/modules/cms/controllers/SitecontentController.php
@@ -14,14 +14,13 @@ class SitecontentController extends Controller
 	public function accessRules()
 	{
 		return array(
-				array('deny',

-						'actions'=>array('*'),

+			array('allow', // allow admin user to perform 'admin' and 'delete' actions
+				'actions'=>array('admin','index','create','view','update','delete'),
+				'users'=>array('admin'),
+			),
+			array('deny',  // deny all users
 				'users'=>array('*'),
 			),
-				array('allow',

-						'actions'=>array('*'),

-						'roles'=>array('admin'),

-				)

 		);
 	}
 	public function actionSearch() 
@@ -46,7 +45,9 @@ class SitecontentController extends Controller
 
 	public function filters()
 	{
-		return array('accessControl');
+		return array(
+			'accessControl', // perform access control for CRUD operations
+		);
 	}
 
 	public function actionView()
diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 63ae0d0..e4f4cf1 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -66,6 +66,10 @@
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin,
 		                "active"=>$this->id == "admin"),
 					// Admin

+				array("label"=>"CMS", "url"=>array("/cms/sitecontent/admin"),

+						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin,

+						"active"=>$this->id == "cms/sitecontent"),
+				// Admin
 			    array("label"=>"Benutzer", "url"=>array("/user/admin"),
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin,
 		                "active"=>$this->id == "user"),