Some refactoring

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 2e058ef50cdc2b8119518edafb4d2700f8b22ded..3affffc123ac3ba30654bc10cb626ebd1dd8d0f3 100644 (file)
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -160,11 +160,11 @@ With 101% height we essentially force the scrollbar to always appear. -->
       <!-- End of page title and user details -->
 
       <!-- Output errors -->
-{if $errors->yes()}
+{if $err->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="error">
-  {foreach $errors->getErrors() as $error}
+  {foreach $err->getErrors() as $error}
             {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
   {/foreach}
           </td>
@@ -174,11 +174,11 @@ With 101% height we essentially force the scrollbar to always appear. -->
       <!-- End of output errors -->
 
       <!-- Output messages -->
-{if $messages->yes()}
+{if $msg->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">
-  {foreach $messages->getErrors() as $message}
+  {foreach $msg->getErrors() as $message}
             {$message.message}<br> {* No need to escape. *}
   {/foreach}
           </td>

diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index b09f0da670cf53f1d56eb70fea48e6540bbc27f8..03bfa18fce00e3a4797748527fc1c40277fcc03b 100644 (file)
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -55,11 +55,11 @@
       <!-- End of top image -->
 
       <!-- Output errors -->
-{if $errors->yes()}
+{if $err->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="error">
-  {foreach $errors->getErrors() as $error}
+  {foreach $err->getErrors() as $error}
             {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
   {/foreach}
           </td>
@@ -69,11 +69,11 @@
       <!-- End of output errors -->
 
       <!-- Output messages -->
-{if $messages->yes()}
+{if $msg->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">
-  {foreach $messages->getErrors() as $message}
+  {foreach $msg->getErrors() as $message}
             {$message.message}<br> {* No need to escape. *}
   {/foreach}
           </td>

diff --git a/import.php b/import.php
index d86628b6cf22dafd323691d85fc97306ea1c1183..23715e080c0c6a9af59871a8a7a96a15b6241be1 100644 (file)
--- a/import.php
+++ b/import.php
@@ -45,8 +45,7 @@ if ($request->isPost()) {
 
   $import = new ttImportHelper($err);
   $import->importXml();
-  if ($err->no())
-    $messages->add($i18n->getKey('form.import.success'));
+  if ($err->no()) $msg->add($i18n->getKey('form.import.success'));
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()) );

diff --git a/initialize.php b/initialize.php
index 2cb0f5be3de69bb60b6e3a4ee3feb9d1a9f965ec..ded539cc25ba9132a2e06378da538395a1e6c54b 100644 (file)
--- a/initialize.php
+++ b/initialize.php
@@ -152,8 +152,8 @@ import('html.HttpRequest');
 $request = new ttHttpRequest();
 
 import('form.ActionErrors');
-$err = 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');
@@ -193,8 +193,8 @@ $GLOBALS['USER'] = &$user;
 
 // Assign things for smarty to use in template files.
 $smarty->assign('i18n', $i18n->keys);
-$smarty->assign('errors', $err);
-$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.
 

diff --git a/invoice_send.php b/invoice_send.php
index 4ec28bcf2328ceed4a7cedf4fdaadf04aff253ac..e519132d6ab5c934447e2925da6cf5e413f97b13 100644 (file)
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -88,7 +88,7 @@ if ($request->isPost()) {
       $mailer->setReceiverCC($cl_cc);
     $mailer->setSendType(MAIL_MODE);
     if ($mailer->send($cl_subject, $body))
-      $messages->add($i18n->getKey('form.mail.invoice_sent'));
+      $msg->add($i18n->getKey('form.mail.invoice_sent'));
     else
       $err->add($i18n->getKey('error.mail_send'));
   }

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 46c89d92c43809f4bb9bcd9cf0cd3f6de5e94f03..8b172e8413887f2c0ceb6ab47b93b6f5403750cc 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -98,7 +98,7 @@ if ($request->isPost()) {
   if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
     $cl_finish = '';
     $cl_duration = '';
-    $messages->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
   }
 }
 

diff --git a/report_send.php b/report_send.php
index 490324559dafbef25ea62e810c19472453cc3068..e11978aa051a10ac7fdbd804bc83ddd916cf8471 100644 (file)
--- a/report_send.php
+++ b/report_send.php
@@ -85,7 +85,7 @@ if ($request->isPost()) {
       $mailer->setReceiverCC($cl_cc);
     $mailer->setSendType(MAIL_MODE);
     if ($mailer->send($cl_subject, $body))
-      $messages->add($i18n->getKey('form.mail.report_sent'));
+      $msg->add($i18n->getKey('form.mail.report_sent'));
     else
       $err->add($i18n->getKey('error.mail_send'));
   }

diff --git a/time_edit.php b/time_edit.php
index 2dca2447c161f8ccab3df36528885964114348b1..b3756b44e891cea73801431248b54f26807dc38d 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -98,7 +98,7 @@ if ($request->isPost()) {
   if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
     $cl_finish = '';
     $cl_duration = '';
-    $messages->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
   }
 }