Changeset 34 for trunk/phpgwapi/inc/adodb/adodb-pager.inc.php

Timestamp:

06/29/07 15:17:46 (17 years ago)

Author:

niltonneto

Message:

Versão nova do ADODB (4.5 para 4.95)

File:

• trunk/phpgwapi/inc/adodb/adodb-pager.inc.php (modified) (5 diffs)

trunk/phpgwapi/inc/adodb/adodb-pager.inc.php

@@ -2 +2 @@
 
 /*
-        V4.51 29 July 2004  (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+        V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
           Released under both BSD license and Lesser GPL library license. 
           Whenever there is any discrepancy between the two licenses, 
@@ -58 +58 @@
         function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
         {
-        global $HTTP_SERVER_VARS,$PHP_SELF,$HTTP_SESSION_VARS,$HTTP_GET_VARS;
+        global $PHP_SELF;
         
                 $curr_page = $id.'_curr_page';
-                if (empty($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
+                if (empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
                 
                 $this->sql = $sql;
@@ -70 +70 @@
                 $next_page = $id.'_next_page';  
                 
-                if (isset($HTTP_GET_VARS[$next_page])) {
-                        $HTTP_SESSION_VARS[$curr_page] = $HTTP_GET_VARS[$next_page];
-                }
-                if (empty($HTTP_SESSION_VARS[$curr_page])) $HTTP_SESSION_VARS[$curr_page] = 1; ## at first page
-                
-                $this->curr_page = $HTTP_SESSION_VARS[$curr_page];
+                if (isset($_GET[$next_page])) {
+                        $_SESSION[$curr_page] = (integer) $_GET[$next_page];
+                }
+                if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
+                
+                $this->curr_page = $_SESSION[$curr_page];
                 
         }
@@ -243 +243 @@
                 $this->rows = $rows;
                 
+                if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
+                
                 $savec = $ADODB_COUNTRECS;
                 if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
@@ -264 +266 @@
                 $grid = $this->RenderGrid();
                 $footer = $this->RenderPageCount();
+                
+                $this->RenderLayout($header,$grid,$footer);
+                
                 $rs->Close();
                 $this->rs = false;
-                
-                $this->RenderLayout($header,$grid,$footer);
         }