diff --git a/application/config/internal.php b/application/config/internal.php index f69c66de9f1..32e27f2e58f 100644 --- a/application/config/internal.php +++ b/application/config/internal.php @@ -87,12 +87,15 @@ 'vardump' => [ 'class' => 'CWebLogRoute', 'levels'=>'error, warning, trace, info', + 'except' => [ + 'system.CModule' + ], 'enabled' => true ], 'trace' => array( 'class' => 'CWebLogRoute', // you can include more levels separated by commas... trace is shown on debug only 'levels' => 'trace', // you can include more separated by commas - 'enabled' => YII_DEBUG && false + 'enabled' => false && true || YII_DEBUG && false ), 'profile' => [ 'class' => 'CProfileLogRoute' diff --git a/application/controllers/OptinController.php b/application/controllers/OptinController.php index bde9334d454..66a258bb14e 100644 --- a/application/controllers/OptinController.php +++ b/application/controllers/OptinController.php @@ -92,11 +92,11 @@ function actiontokens($surveyid, $token, $langcode = '') //PRINT COMPLETED PAGE if (!$aSurveyInfo['templatedir']) { - $sTemplate=getTemplatePath(Yii::app()->getConfig("defaulttemplate")); + $sTemplate=Template::getTemplatePath(Yii::app()->getConfig("defaulttemplate")); } else { - $sTemplate=getTemplatePath($aSurveyInfo['templatedir']); + $sTemplate=Template::getTemplatePath($aSurveyInfo['templatedir']); } $this->_renderHtml($sMessage,$sTemplate,$aSurveyInfo); } diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php index a7a504fcf01..005591e7b8c 100644 --- a/application/controllers/OptoutController.php +++ b/application/controllers/OptoutController.php @@ -89,11 +89,11 @@ function actiontokens() //PRINT COMPLETED PAGE if (!$aSurveyInfo['templatedir']) { - $sTemplate=getTemplatePath(Yii::app()->getConfig("defaulttemplate")); + $sTemplate=Template::getTemplatePath(Yii::app()->getConfig("defaulttemplate")); } else { - $sTemplate=getTemplatePath($aSurveyInfo['templatedir']); + $sTemplate=Template::getTemplatePath($aSurveyInfo['templatedir']); } $this->_renderHtml($sMessage,$sTemplate,$aSurveyInfo); @@ -176,11 +176,11 @@ function actionparticipants() //PRINT COMPLETED PAGE if (!$aSurveyInfo['templatedir']) { - $sTemplate=getTemplatePath(Yii::app()->getConfig("defaulttemplate")); + $sTemplate=Template::getTemplatePath(Yii::app()->getConfig("defaulttemplate")); } else { - $sTemplate=getTemplatePath($aSurveyInfo['templatedir']); + $sTemplate=Template::getTemplatePath($aSurveyInfo['templatedir']); } $this->_renderHtml($sMessage,$sTemplate, $aSurveyInfo); diff --git a/application/controllers/PrintanswersController.php b/application/controllers/PrintanswersController.php index 224b60b9705..8ec162d1f7a 100644 --- a/application/controllers/PrintanswersController.php +++ b/application/controllers/PrintanswersController.php @@ -67,13 +67,13 @@ function actionView($surveyid,$printableexport=FALSE) { sendCacheHeaders(); doHeader(); - echo templatereplace(file_get_contents(getTemplatePath($sTemplate).'/startpage.pstpl'),array()); + echo templatereplace(file_get_contents(Template::getTemplatePath($sTemplate).'/startpage.pstpl'),array()); echo "