Merge pull request #11280 from atm-maxime/fix_warning_page_var

Fix : avoid warning and uniformize $page var use
Dolibarr · Jun 2, 2019 · 40b212d · 40b212d
2 parents 190cf8a + 6dd01e8
commit 40b212d
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
@@ -87,7 +87,7 @@
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1 || $page == null) { $page = 0 ; }
+if (empty($page) || $page == -1) { $page = 0 ; }
 $offset = $limit * $page ;
 if (! $sortorder)
 {

diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
@@ -42,7 +42,7 @@
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1 || $page == null) { $page = 0 ; }
+if (empty($page) || $page == -1) { $page = 0 ; }
 $offset = $limit * $page ;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="a.datep";

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
@@ -817,7 +817,7 @@ function callForResult(imgId)
  */
 if (! GETPOST('action','aZ09'))
 {
-    if ($page == -1) $page = 0 ;
+    if (empty($page) || $page == -1) $page = 0 ;
     $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
     $offset = $limit * $page ;
 

diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
@@ -55,7 +55,7 @@
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) {
+if (empty($page) || $page == -1) {
     $page = 0;
 }
 $offset = $conf->liste_limit * $page;

diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
@@ -56,9 +56,10 @@
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) {
+if (empty($page) || $page == -1) {
     $page = 0;
 }
+
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
@@ -753,7 +753,7 @@ function callForResult(imgId)
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
     $page=GETPOST("page",'int');
-    if ($page == -1 || $page == null) { $page = 0 ; }
+    if (empty($page) || $page == -1) { $page = 0 ; }
     $offset = $limit * $page ;
     $pageprev = $page - 1;
     $pagenext = $page + 1;

diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
@@ -54,7 +54,7 @@
 if (!$sortorder) $sortorder="DESC";
 if (!$sortfield) $sortfield="e.rowid";
 
-if ($page == -1) {
+if (empty($page) || $page == -1) {
 	$page = 0 ;
 }
 

diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
@@ -47,7 +47,7 @@
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) {
+if (empty($page) || $page == -1) {
     $page = 0;
 }
 $offset = $conf->liste_limit * $page;

diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
@@ -97,8 +97,7 @@
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page");
-$page = is_numeric($page) ? $page : 0;
-$page = $page == -1 ? 0 : $page;
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;

diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
@@ -42,7 +42,7 @@
   $sortfield="s.nom";
 }
 
-if ($page == -1 || $page == null) { $page = 0 ; }
+if (empty($page) || $page == -1) { $page = 0 ; }
 
 $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;