[#431] Fix several 'undefined index' warnings.

There were several errors like this in the logs: PHP Notice: Undefined index: dateFormat in /var/www/html/phpreport/web/services/getProjectUserWeeklyHoursReportJsonService.php on line 41 Used the new PHP7 null coalesce operator to assign default values in those cases that printed a warning. Also removed $login which was never used in these services.
Igalia · Dec 1, 2018 · 0f30c55 · 0f30c55
1 parent 54f798a
commit 0f30c55
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 25 deletions.
diff --git a/docs/admin/installation.rst b/docs/admin/installation.rst
@@ -10,7 +10,7 @@ To install PhpReport in your system, you will need the following software:
 
 * PostgreSQL database server (tested with PostgreSQL 9)
 
-* PHP 5.4 or higher
+* PHP 7.0 or higher
 
   * Support for PostgreSQL
 

diff --git a/web/auth.php b/web/auth.php
@@ -19,7 +19,7 @@
  */
 
 
-    $sid = $_GET['sid'];
+    $sid = $_GET['sid'] ?? NULL;
 
     /* We check authentication and authorization */
     require_once(PHPREPORT_ROOT . '/util/LoginManager.php');

diff --git a/web/services/getProjectUserCustomerReportJsonService.php b/web/services/getProjectUserCustomerReportJsonService.php
@@ -35,15 +35,13 @@
 
     $projectId = $_GET['pid'];
 
-    $init = $_GET['init'];
+    $init = $_GET['init'] ?? "";
 
-    $end = $_GET['end'];
+    $end = $_GET['end'] ?? "";
 
-    $dateFormat = $_GET['dateFormat'];
+    $dateFormat = $_GET['dateFormat'] ?? "Y-m-d";
 
-    $login = $_GET['login'];
-
-    $sid = $_GET['sid'];
+    $sid = $_GET['sid'] ?? NULL;
 
     do {
 
@@ -97,9 +95,6 @@
             }
         }
 
-        if ($dateFormat=="")
-            $dateFormat = "Y-m-d";
-
         if ($init!="")
         {
             $response['init'] = $init;

diff --git a/web/services/getProjectUserStoryReportJsonService.php b/web/services/getProjectUserStoryReportJsonService.php
@@ -34,13 +34,13 @@
 
     $projectId = $_GET['pid'];
 
-    $init = $_GET['init'];
+    $init = $_GET['init'] ?? "";
 
-    $end = $_GET['end'];
+    $end = $_GET['end'] ?? "";
 
-    $dateFormat = $_GET['dateFormat'];
+    $dateFormat = $_GET['dateFormat'] ?? "Y-m-d";
 
-    $sid = $_GET['sid'];
+    $sid = $_GET['sid'] ?? NULL;
 
     do {
 
@@ -76,9 +76,6 @@
             break;
         }
 
-        if ($dateFormat=="")
-            $dateFormat = "Y-m-d";
-
         if ($init!="")
         {
             $response['init'] = $init;

diff --git a/web/services/getProjectUserWeeklyHoursReportJsonService.php b/web/services/getProjectUserWeeklyHoursReportJsonService.php
@@ -34,13 +34,13 @@
 
 $projectId = $_GET['pid'];
 
-$init = $_GET['init'];
+$init = $_GET['init'] ?? "";
 
-$end = $_GET['end'];
+$end = $_GET['end'] ?? "";
 
-$dateFormat = $_GET['dateFormat'];
+$dateFormat = $_GET['dateFormat'] ?? "Y-m-d";
 
-$login = $_GET['login'];
+$sid = $_GET['sid'] ?? NULL;
 
 do {
 
@@ -74,9 +74,6 @@
         break;
     }
 
-    if ($dateFormat=="")
-        $dateFormat = "Y-m-d";
-
     if ($init!="")
     {
         $response['init'] = $init;