Changeset 825 for trunk/Common/Global.php

Timestamp:

Apr 16, 2016, 9:53:17 PM (8 years ago)

Author:

chronos

Message:

• Added: Allow to independently select table page and column order. This solves a problem where going between pages with tables incorrectly set default ordering column.

File:

• trunk/Common/Global.php (modified) (7 diffs)

trunk/Common/Global.php

@@ -131 +131 @@
 }
 
-function GetPageList($TotalCount)
+function GetPageList($ObjectName, $TotalCount)
 {
   global $System;
@@ -149 +149 @@
   }
 
-  if(!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-  if(array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-  if($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-  if($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
-  $CurrentPage = $_SESSION['Page'];
-
+  if(!array_key_exists($ObjectName.'Page', $_SESSION)) $_SESSION[$ObjectName.'Page'] = 0;
+  if(array_key_exists('ObjectName', $_GET) and ($_GET['ObjectName'] == $ObjectName)) {
+    if(array_key_exists('page', $_GET)) $_SESSION[$ObjectName.'Page'] = $_GET['page'] * 1;
+  }
+  if($_SESSION[$ObjectName.'Page'] < 0) $_SESSION[$ObjectName.'Page'] = 0;
+  if($_SESSION[$ObjectName.'Page'] >= $PageCount) $_SESSION[$ObjectName.'Page'] = $PageCount - 1;
+  $CurrentPage = $_SESSION[$ObjectName.'Page'];
 
   $Result .= 'Počet položek: <strong>'.$TotalCount.'</strong> &nbsp; Stránky: ';
+  $QueryItems['ObjectName'] = $ObjectName;
 
   $Result = '';
@@ -206 +208 @@
 $OrderArrowImage = array('sort_asc.png', 'sort_desc.png');
 
-function GetOrderTableHeader($Columns, $DefaultColumn, $DefaultOrder = 0)
+function GetOrderTableHeader($ObjectName, $Columns, $DefaultColumn, $DefaultOrder = 0)
 {
   global $OrderDirSQL, $OrderArrowImage, $Config, $System;
 
-  if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
-  if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
-
+  if(array_key_exists('ObjectName', $_GET) and ($_GET['ObjectName'] == $ObjectName)) 
+  {
+    if(array_key_exists('OrderCol', $_GET)) $_SESSION[$ObjectName.'OrderCol'] = $_GET['OrderCol'];
+    if(array_key_exists('OrderDir', $_GET)) $_SESSION[$ObjectName.'OrderDir'] = $_GET['OrderDir'];
+  }
+  if(!array_key_exists($ObjectName.'OrderCol', $_SESSION)) $_SESSION[$ObjectName.'OrderCol'] = $DefaultColumn;
+  if(!array_key_exists($ObjectName.'OrderDir', $_SESSION) ) $_SESSION[$ObjectName.'OrderDir'] = $DefaultOrder;
+    
   // Check OrderCol
   $Found = false;
   foreach($Columns as $Column)
   {
-    if($Column['Name'] == $_SESSION['OrderCol'])
+    if($Column['Name'] == $_SESSION[$ObjectName.'OrderCol'])
     {
       $Found = true;
@@ -225 +230 @@
     }
   }
-  if(($_SESSION['OrderCol'] == '') or ($Found == false))
-  {
-    $_SESSION['OrderCol'] = $DefaultColumn;
-    $_SESSION['OrderDir'] = $DefaultOrder;
+  if(($_SESSION[$ObjectName.'OrderCol'] == '') or ($Found == false))
+  {
+    $_SESSION[$ObjectName.'OrderCol'] = $DefaultColumn;
+    $_SESSION[$ObjectName.'OrderDir'] = $DefaultOrder;
   }
   // Check OrderDir
-  if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
+  if(($_SESSION[$ObjectName.'OrderDir'] != 0) and ($_SESSION[$ObjectName.'OrderDir'] != 1)) 
+    $_SESSION[$ObjectName.'OrderDir'] = 0;
 
   $Result = '';
@@ -237 +243 @@
   foreach($Columns as $Index => $Column)
   {
+    $QueryItems['ObjectName'] = $ObjectName;
     $QueryItems['OrderCol'] = $Column['Name'];
-    $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.$System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow">';
+    $QueryItems['OrderDir'] = 1 - $_SESSION[$ObjectName.'OrderDir'];
+    if($Column['Name'] == $_SESSION[$ObjectName.'OrderCol']) 
+      $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
+      $System->Link('/images/'.$OrderArrowImage[$_SESSION[$ObjectName.'OrderDir']]).'" alt="order arrow">';
       else $ArrowImage = '';
     if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';
@@ -245 +254 @@
   }
   return(array(
-    'SQL' => ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$OrderDirSQL[$_SESSION['OrderDir']],
+    'SQL' => ' ORDER BY `'.$_SESSION[$ObjectName.'OrderCol'].'` '.$OrderDirSQL[$_SESSION[$ObjectName.'OrderDir']],
     'Output' => '<tr>'.$Result.'</tr>',
-    'Column' => $_SESSION['OrderCol'],
-    'Direction' => $_SESSION['OrderDir'],
+    'Column' => $_SESSION[$ObjectName.'OrderCol'],
+    'Direction' => $_SESSION[$ObjectName.'OrderDir'],
   ));
 }
@@ -365 +374 @@
     if($Delay < 0) $Delay = 0;
 
-    echo('Waiting remaining '.$Delay.' of '.$Period.' seconds...'."\n");
+    echo('Waiting remaining '.$Delay.' of '.$Period.' seconds period...'."\n");
     sleep($Delay);
   }