More refactoring.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4b7a7d03a5388f997c83c456041a6b20dade1af..0fc36c1cd060d4e7a9a69535c1d72957a7480eaf 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4234 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4235 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl
index 49fd2267eed6b10e4941884c68d3fd1063c6778f..96687797dd01bdcee0ebb5bdf7fb76365c0808bd 100644 (file)
--- a/WEB-INF/templates/register.tpl
+++ b/WEB-INF/templates/register.tpl
@@ -1,40 +1,40 @@
-{$forms.profileForm.open}
+{$forms.groupForm.open}

 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right" nowrap>{$i18n.label.group_name}:</td>
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right" nowrap>{$i18n.label.group_name}:</td>

-          <td>{$forms.profileForm.team_name.control}</td>
+          <td>{$forms.groupForm.group_name.control}</td>

         </tr>
         <tr>
           <td align="right">{$i18n.label.currency}:</td>
         </tr>
         <tr>
           <td align="right">{$i18n.label.currency}:</td>

-          <td>{$forms.profileForm.currency.control}</td>
+          <td>{$forms.groupForm.currency.control}</td>

         </tr>
         <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
         </tr>
         <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>

-           <td>{$forms.profileForm.lang.control}</td>
+           <td>{$forms.groupForm.lang.control}</td>

         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>

-          <td>{$forms.profileForm.manager_name.control}</td>
+          <td>{$forms.groupForm.manager_name.control}</td>

         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>

-          <td>{$forms.profileForm.manager_login.control}</td>
+          <td>{$forms.groupForm.manager_login.control}</td>

         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.password} (*):</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.password} (*):</td>

-          <td>{$forms.profileForm.password1.control}</td>
+          <td>{$forms.groupForm.password1.control}</td>

         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>

-          <td>{$forms.profileForm.password2.control}</td>
+          <td>{$forms.groupForm.password2.control}</td>

         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.email}:</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.email}:</td>

-          <td>{$forms.profileForm.manager_email.control}</td>
+          <td>{$forms.groupForm.manager_email.control}</td>

         </tr>
         <tr>
           <td></td>
         </tr>
         <tr>
           <td></td>


@@ -42,10 +42,10 @@
         </tr>
         <tr><td colspan="2">&nbsp;</td></tr>
         <tr>
         </tr>
         <tr><td colspan="2">&nbsp;</td></tr>
         <tr>

-          <td colspan="2" height="50" align="center">{$forms.profileForm.btn_submit.control}</td>
+          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_submit.control}</td>

         </tr>
       </table>
     </td>
   </tr>
 </table>
         </tr>
       </table>
     </td>
   </tr>
 </table>

-{$forms.profileForm.close}
+{$forms.groupForm.close}

diff --git a/register.php b/register.php
index d1e9ff90e77796007bdebc8664eedfd8c86d577d..4568e37090ef4fd42eb4baa4e773ea772cf75c17 100644 (file)
--- a/register.php
+++ b/register.php
@@ -39,7 +39,7 @@ $auth->doLogout();
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost()) {
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost()) {

-  $cl_team_name = trim($request->getParameter('team_name'));
+  $cl_group_name = trim($request->getParameter('group_name'));

   $cl_currency = trim($request->getParameter('currency'));
   if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
   $cl_lang = $request->getParameter('lang');
   $cl_currency = trim($request->getParameter('currency'));
   if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
   $cl_lang = $request->getParameter('lang');


@@ -53,8 +53,8 @@ if ($request->isPost()) {
   $cl_lang = $i18n->lang; // Browser setting from initialize.php.
 }
 
   $cl_lang = $i18n->lang; // Browser setting from initialize.php.
 }
 

-$form = new Form('profileForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team_name));
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group_name));

 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.


@@ -90,7 +90,7 @@ if ($request->isPost()) {
     'password1' => $cl_password1,
     'password2' => $cl_password2,
     'email' => $cl_manager_email,
     'password1' => $cl_password1,
     'password2' => $cl_password2,
     'email' => $cl_manager_email,

-    'group_name' => $cl_team_name,
+    'group_name' => $cl_group_name,

     'currency' => $cl_currency,
     'lang' => $cl_lang);
 
     'currency' => $cl_currency,
     'lang' => $cl_lang);
 


@@ -113,6 +113,6 @@ if ($request->isPost()) {
 
 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 
 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-$smarty->assign('onload', 'onLoad="document.profileForm.team.focus()"');
+$smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');

 $smarty->assign('content_page_name', 'register.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('content_page_name', 'register.tpl');
 $smarty->display('index.tpl');

diff --git a/users.php b/users.php
index af5389021e53487906edd52b40d94a9da217e35f..d20617bca4b567080f247e87fc34cdd3726280ca 100644 (file)
--- a/users.php
+++ b/users.php
@@ -52,7 +52,7 @@ if($user->can('manage_users')) {
   $inactive_users = $user->getUsers($options);
 }
 
   $inactive_users = $user->getUsers($options);
 }
 

-// Check if the team is set to show indicators for uncompleted time entries.
+// Check if the group is set to show indicators for uncompleted time entries.

 if ($user->uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
 if ($user->uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {