More consistent use of isGet() and isPost() functions.

diff --git a/WEB-INF/lib/html/HttpRequest.class.php b/WEB-INF/lib/html/HttpRequest.class.php
index cd66a8cc6440cc4b36a72a54147d702d8f7b5d4d..2eb26f0a7cf1664876061d1df3344457e6f807ee 100644 (file)
--- a/WEB-INF/lib/html/HttpRequest.class.php
+++ b/WEB-INF/lib/html/HttpRequest.class.php
@@ -42,17 +42,17 @@ class ttHttpRequest {
     return ($this->getMethod() == 'POST');
   }
 
     return ($this->getMethod() == 'POST');
   }
 

-  // The getParameter is the primary function of this class. It returns request parameter,
+  // The getParameter is the primary function of this class. It returns request parameter

   // identified by $name.
   // identified by $name.

-  function getParameter($name = "", $default = null) { 
+  function getParameter($name = '', $default = null) {

     switch ($this->getMethod())
     {
       case 'GET':
     switch ($this->getMethod())
     {
       case 'GET':

-               if (isset($_GET[$name]) && ($_GET[$name] != ""))
+        if (isset($_GET[$name]) && ($_GET[$name] != ''))

           return $_GET[$name];
 
       case 'POST':
           return $_GET[$name];
 
       case 'POST':

-        if (isset($_POST[$name]) && ($_POST[$name] != ""))
+        if (isset($_POST[$name]) && ($_POST[$name] != ''))

           return  $_POST[$name];
     }
     return $default;
           return  $_POST[$name];
     }
     return $default;

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f994bf1b92706a52ed727a9142540a46b0a4e50a..af0b60e8d6444b01d80664cfcc8e2dd38b4b8ea3 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.15.0.3760 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.15.0.3761 | 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/mobile/expenses.php b/mobile/expenses.php
index fafe1373e19a3a722d99f02de3679657bf13b050..790a7ace0966a8b62424930168304c134f637fe8 100644 (file)
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -54,9 +54,9 @@ $next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date)));
 
 // Initialize variables.
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id']) ? $_SESSION['behalf_id'] : $user->id));
 
 // Initialize variables.
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id']) ? $_SESSION['behalf_id'] : $user->id));

-$cl_client = $request->getParameter('client', ($request->getMethod()=='POST' ? null : @$_SESSION['client']));
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));

 $_SESSION['client'] = $cl_client;
 $_SESSION['client'] = $cl_client;

-$cl_project = $request->getParameter('project', ($request->getMethod()=='POST' ? null : @$_SESSION['project']));
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));

 $_SESSION['project'] = $cl_project;
 $cl_item_name = $request->getParameter('item_name');
 $cl_cost = $request->getParameter('cost');
 $_SESSION['project'] = $cl_project;
 $cl_item_name = $request->getParameter('item_name');
 $cl_cost = $request->getParameter('cost');

diff --git a/mobile/time.php b/mobile/time.php
index db8aa34bf5cc8368a3c80fa7e921fc99a5bfefad..0c634f3a55765837e5aafd8267baf731abf873dd 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -66,7 +66,7 @@ $cl_finish = trim($request->getParameter('finish'));
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
 // Custom field.
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
 // Custom field.

-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1'])));
+$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));

 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {


@@ -77,11 +77,11 @@ if ($user->isPluginEnabled('iv')) {
     if (isset($_SESSION['billable']))
       $cl_billable = $_SESSION['billable'];
 }
     if (isset($_SESSION['billable']))
       $cl_billable = $_SESSION['billable'];
 }

-$cl_client = $request->getParameter('client', ($request->getMethod()=='POST'? null : @$_SESSION['client']));
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));

 $_SESSION['client'] = $cl_client;
 $_SESSION['client'] = $cl_client;

-$cl_project = $request->getParameter('project', ($request->getMethod()=='POST'? null : @$_SESSION['project']));
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));

 $_SESSION['project'] = $cl_project;
 $_SESSION['project'] = $cl_project;

-$cl_task = $request->getParameter('task', ($request->getMethod()=='POST'? null : @$_SESSION['task']));
+$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));

 $_SESSION['task'] = $cl_task;
 
 // Elements of timeRecordForm.
 $_SESSION['task'] = $cl_task;
 
 // Elements of timeRecordForm.

diff --git a/mobile/timer.php b/mobile/timer.php
index cdb32c7b84ae8e8952e87d59c95163f42bdbb067..1fa6c137750291a96e06a21b67e079595eaf43a5 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -61,7 +61,7 @@ if ($user->isPluginEnabled('cf')) {
 $cl_start = trim($request->getParameter('browser_time'));
 $cl_finish = trim($request->getParameter('browser_time'));
 // Custom field.
 $cl_start = trim($request->getParameter('browser_time'));
 $cl_finish = trim($request->getParameter('browser_time'));
 // Custom field.

-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1'])));
+$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));

 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {

diff --git a/reports.php b/reports.php
index f6d9cf05d53ff4763e81cfa56e945390432d70bc..710de524691e4afd0cfa93dbd76d6d8746a4def8 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -231,7 +231,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->ge
 $bean = new ActionForm('reportBean', $form, $request);
 // At this point form values are obtained from session if they are there.
 
 $bean = new ActionForm('reportBean', $form, $request);
 // At this point form values are obtained from session if they are there.
 

-if (($request->getMethod() == 'GET') && !$bean->isSaved()) {
+if ($request->isGet() && !$bean->isSaved()) {

   // No previous form data were found in session. Use the following default values.
   $form->setValueByElement('users', array_keys($user_list));
   $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format));
   // No previous form data were found in session. Use the following default values.
   $form->setValueByElement('users', array_keys($user_list));
   $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format));

diff --git a/time.php b/time.php
index c001f21f617b14c67f339a0de41b221e50a2a116..caab2bd717fbfdbb5f733f937757cf293acfadc1 100644 (file)
--- a/time.php
+++ b/time.php
@@ -81,7 +81,7 @@ $cl_finish = trim($request->getParameter('finish'));
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
 // Custom field.
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
 // Custom field.

-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1'])));
+$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));

 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {


@@ -93,11 +93,11 @@ if ($user->isPluginEnabled('iv')) {
       $cl_billable = $_SESSION['billable'];
 }
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
       $cl_billable = $_SESSION['billable'];
 }
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));

-$cl_client = $request->getParameter('client', ($request->getMethod()=='POST'? null : @$_SESSION['client']));
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));

 $_SESSION['client'] = $cl_client;
 $_SESSION['client'] = $cl_client;

-$cl_project = $request->getParameter('project', ($request->getMethod()=='POST'? null : @$_SESSION['project']));
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));

 $_SESSION['project'] = $cl_project;
 $_SESSION['project'] = $cl_project;

-$cl_task = $request->getParameter('task', ($request->getMethod()=='POST'? null : @$_SESSION['task']));
+$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));

 $_SESSION['task'] = $cl_task;
 
 // Elements of timeRecordForm.
 $_SESSION['task'] = $cl_task;
 
 // Elements of timeRecordForm.

diff --git a/week.php b/week.php
index 5db40a2581fad4f5416994a8bb51b8f7fa5c56a5..16fd79ba7b842e15390e4321ff0eae3dd9d57a2b 100644 (file)
--- a/week.php
+++ b/week.php
@@ -89,7 +89,7 @@ if ($user->isPluginEnabled('mq')){
 
 // Initialize variables.
 // Custom field.
 
 // Initialize variables.
 // Custom field.

-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1'])));
+$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));

 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {


@@ -101,11 +101,11 @@ if ($user->isPluginEnabled('iv')) {
       $cl_billable = $_SESSION['billable'];
 }
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
       $cl_billable = $_SESSION['billable'];
 }
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));

-$cl_client = $request->getParameter('client', ($request->getMethod()=='POST'? null : @$_SESSION['client']));
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));

 $_SESSION['client'] = $cl_client;
 $_SESSION['client'] = $cl_client;

-$cl_project = $request->getParameter('project', ($request->getMethod()=='POST'? null : @$_SESSION['project']));
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));

 $_SESSION['project'] = $cl_project;
 $_SESSION['project'] = $cl_project;

-$cl_task = $request->getParameter('task', ($request->getMethod()=='POST'? null : @$_SESSION['task']));
+$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));

 $_SESSION['task'] = $cl_task;
 
 // Get the data we need to display week view.
 $_SESSION['task'] = $cl_task;
 
 // Get the data we need to display week view.