diff options
| author | Astaf User <info@astaf.de> | 2014-06-27 14:33:50 +0200 |
|---|---|---|
| committer | Astaf User <info@astaf.de> | 2014-06-27 14:33:50 +0200 |
| commit | cb615cdc0f43e76cba5a61260afa37c88eda9603 (patch) | |
| tree | 514c032f27913ed99a03dc784d5478379cb9d86c /protected | |
| parent | 95fa990f86d31850bd5876866d5d3058dc650f5a (diff) | |
| parent | 4942419cea401d6303d2f415eb8c2a8302ae7113 (diff) | |
Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/www.astaf.de
Conflicts:
protected/config/main.php
Diffstat (limited to 'protected')
| -rw-r--r-- | protected/config/main.php | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/protected/config/main.php b/protected/config/main.php index ab7ab8f..3305301 100644 --- a/protected/config/main.php +++ b/protected/config/main.php @@ -20,7 +20,7 @@ return array( 'application.models.*', 'application.components.*', 'application.extensions.ddeditor.*', - 'application.extensions.wetter.*', + // 'application.extensions.wetter.*', 'application.modules.cms.models.*', // 'application.extensions.extckeditor.*', ), @@ -58,6 +58,7 @@ return array( 'urlManager'=>array( 'urlFormat'=>'path', 'rules'=>array( + 'Programm/<tag:\w+>'=>'veranstaltung/index', '<controller:\w+>/<id:\d+>'=>'<controller>/view', '<controller:\w+>/<action:\w+>/<id:\d+>'=>'<controller>/<action>', '<controller:\w+>/<action:\w+>'=>'<controller>/<action>', @@ -70,10 +71,10 @@ return array( // uncomment the following to use a MySQL database 'db'=>array( - 'connectionString' => 'mysql:host=database;dbname=astaf_2012', + 'connectionString' => 'mysql:host=localhost;dbname=astaf', 'emulatePrepare' => true, - 'username' => 'astaf', - 'password' => 'AsTaF4', + 'username' => 'root', + 'password' => '', 'charset' => 'utf8', 'tablePrefix' => 'tbl_' ), @@ -85,15 +86,19 @@ return array( 'log'=>array( 'class'=>'CLogRouter', 'routes'=>array( - array( + 'file'=>array( 'class'=>'CFileLogRoute', - 'levels'=>'error, warning',//, debug,trace', + 'levels'=>'error, warning, debug, trace', + 'categories'=>'system.db.*', ), // uncomment the following to show log messages on web pages - /*array( + 'web'=>array( 'class'=>'CWebLogRoute', - ),*/ + + 'levels'=>'trace, info, error, warning', + 'categories'=>'system.db.*', + ), ), ), |