X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=initialize.php;h=ded539cc25ba9132a2e06378da538395a1e6c54b;hb=11441db31dcbed7b2070e800bcb1b0e6547b86bd;hp=ce6acdfc47ab10f37a23d8ad3b1ec16999be1753;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/initialize.php b/initialize.php
index ce6acdfc..ded539cc 100644
--- a/initialize.php
+++ b/initialize.php
@@ -67,7 +67,7 @@ check_extension('mbstring');
 // If auth params are not defined (in config.php) - initialize with an empty array.
 if (!isset($GLOBALS['AUTH_MODULE_PARAMS']) || !is_array($GLOBALS['AUTH_MODULE_PARAMS']))
   $GLOBALS['AUTH_MODULE_PARAMS'] = array();
-  
+
 // Smarty initialization.
 import('smarty.Smarty');
 $smarty = new Smarty;
@@ -93,7 +93,7 @@ if (isset($_COOKIE['tt_PHPSESSID'])) {
 }
 
 // Start or resume PHP session.
-session_name('tt_PHPSESSID'); // "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.  
+session_name('tt_PHPSESSID'); // "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.
 @session_start();
 
 // Authorization.
@@ -152,8 +152,8 @@ import('html.HttpRequest');
 $request = new ttHttpRequest();
 
 import('form.ActionErrors');
-$errors = new ActionErrors();
-$messages = new ActionErrors();
+$err = new ActionErrors(); // Error messages for user.
+$msg = new ActionErrors(); // Notification messages (not errrors) for user.
 
 // Create an instance of ttUser class. This gets us most of user details.
 import('ttUser');
@@ -173,11 +173,11 @@ $lang = $user->lang;
 if (!$lang) {
   if (defined('LANG_DEFAULT'))
     $lang = LANG_DEFAULT;
-  
+
   // If we still do not have the language get it from the browser.
   if (!$lang) {
     $lang = $i18n->getBrowserLanguage();
-   	 
+
     // Finally - English is the default.
     if (!$lang) {
       $lang = 'en';
@@ -193,11 +193,11 @@ $GLOBALS['USER'] = &$user;
 
 // Assign things for smarty to use in template files.
 $smarty->assign('i18n', $i18n->keys);
-$smarty->assign('errors', $errors);
-$smarty->assign('messages', $messages);
+$smarty->assign('err', $err);
+$smarty->assign('msg', $msg);
+
+// TODO: move this code out of here to the files that use it.
 
-// TODO: move this code out of here to the files that use it. 
-  
 // We use js/strftime.js to print dates in JavaScript (in DateField controls).
 // One of our date formats (%d.%m.%Y %a) prints a localized short weekday name (%a).
 // The init_js_date_locale function iniitializes Date.ext.locales array in js/strftime.js for our language
@@ -248,4 +248,3 @@ function init_js_date_locale()
     };";
   $smarty->assign('js_date_locale', $js);
 }
-?>
\ No newline at end of file