From 9b492942ee2d518cb2ab1832431d22c2ad9124c6 Mon Sep 17 00:00:00 2001 From: DSB Date: Sat, 4 Aug 2012 17:36:51 +0000 Subject: [PATCH] QA --- application/controllers/IndexController.php | 19 +++++++++---------- public/index.php | 12 ++++-------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index 5f3fcfd..2c98245 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -247,8 +247,7 @@ class IndexController extends Msd_Controller_Action // user is not listed in users.ini break; case Msd_User::SUCCESS: - $defaultDb = $this->view->config->getParam('dbuser.defaultDb' - ); + $defaultDb = $this->view->config->getParam('dbuser.defaultDb'); // set actualDb to defaultDb if ($defaultDb != '') { @@ -266,14 +265,14 @@ class IndexController extends Msd_Controller_Action // if we get here wrong credentials are given $this->view->popUpMessage() ->addMessage( - 'login-message', - 'L_LOGIN', - $user->getAuthMessages(), - array( - 'modal' => true, - 'dialogClass' => 'error' - ) - ); + 'login-message', + 'L_LOGIN', + $user->getAuthMessages(), + array( + 'modal' => true, + 'dialogClass' => 'error' + ) + ); } } $this->view->form = $form; diff --git a/public/index.php b/public/index.php index ad4bc3c..3a57c87 100644 --- a/public/index.php +++ b/public/index.php @@ -3,11 +3,11 @@ define('WORK_PATH', realpath(dirname(__FILE__) . '/../work')); // Define path to application directory defined('APPLICATION_PATH') || define( - 'APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application') +'APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application') ); defined('LIBRARY_PATH') || define( - 'LIBRARY_PATH', realpath(dirname(__FILE__) . '/../library') +'LIBRARY_PATH', realpath(dirname(__FILE__) . '/../library') ); // Define application environment @@ -22,10 +22,7 @@ if (!defined('APPLICATION_ENV')) { } // Ensure library/ is on include_path -set_include_path( - implode(PATH_SEPARATOR, array(LIBRARY_PATH, get_include_path()) - ) -); +set_include_path(implode(PATH_SEPARATOR, array(LIBRARY_PATH, get_include_path()))); if (APPLICATION_ENV == 'development' && !class_exists('Debug')) { include_once 'Debug.php'; @@ -40,5 +37,4 @@ $application = new Zend_Application( APPLICATION_ENV, APPLICATION_PATH . '/configs/application.ini' ); -$application->bootstrap() - ->run(); +$application->bootstrap()->run();