1
0
Fork 0
Dieser Commit ist enthalten in:
DSB 2012-08-04 17:36:51 +00:00
Ursprung 2c0641c348
Commit 9b492942ee
2 geänderte Dateien mit 13 neuen und 18 gelöschten Zeilen

Datei anzeigen

@ -247,8 +247,7 @@ class IndexController extends Msd_Controller_Action
// user is not listed in users.ini // user is not listed in users.ini
break; break;
case Msd_User::SUCCESS: case Msd_User::SUCCESS:
$defaultDb = $this->view->config->getParam('dbuser.defaultDb' $defaultDb = $this->view->config->getParam('dbuser.defaultDb');
);
// set actualDb to defaultDb // set actualDb to defaultDb
if ($defaultDb != '') { if ($defaultDb != '') {
@ -266,14 +265,14 @@ class IndexController extends Msd_Controller_Action
// if we get here wrong credentials are given // if we get here wrong credentials are given
$this->view->popUpMessage() $this->view->popUpMessage()
->addMessage( ->addMessage(
'login-message', 'login-message',
'L_LOGIN', 'L_LOGIN',
$user->getAuthMessages(), $user->getAuthMessages(),
array( array(
'modal' => true, 'modal' => true,
'dialogClass' => 'error' 'dialogClass' => 'error'
) )
); );
} }
} }
$this->view->form = $form; $this->view->form = $form;

Datei anzeigen

@ -3,11 +3,11 @@ define('WORK_PATH', realpath(dirname(__FILE__) . '/../work'));
// Define path to application directory // Define path to application directory
defined('APPLICATION_PATH') || define( defined('APPLICATION_PATH') || define(
'APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application') 'APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application')
); );
defined('LIBRARY_PATH') || define( defined('LIBRARY_PATH') || define(
'LIBRARY_PATH', realpath(dirname(__FILE__) . '/../library') 'LIBRARY_PATH', realpath(dirname(__FILE__) . '/../library')
); );
// Define application environment // Define application environment
@ -22,10 +22,7 @@ if (!defined('APPLICATION_ENV')) {
} }
// Ensure library/ is on include_path // Ensure library/ is on include_path
set_include_path( set_include_path(implode(PATH_SEPARATOR, array(LIBRARY_PATH, get_include_path())));
implode(PATH_SEPARATOR, array(LIBRARY_PATH, get_include_path())
)
);
if (APPLICATION_ENV == 'development' && !class_exists('Debug')) { if (APPLICATION_ENV == 'development' && !class_exists('Debug')) {
include_once 'Debug.php'; include_once 'Debug.php';
@ -40,5 +37,4 @@ $application = new Zend_Application(
APPLICATION_ENV, APPLICATION_ENV,
APPLICATION_PATH . '/configs/application.ini' APPLICATION_PATH . '/configs/application.ini'
); );
$application->bootstrap() $application->bootstrap()->run();
->run();