From ab815be1feaedc9b66e96ff37a97e07e43f3f5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Wed, 8 Aug 2001 14:29:49 +0000
Subject: [PATCH] merged patch #443393

---
 ChangeLog             |   5 +++--
 images/asc_order.gif  | Bin 0 -> 842 bytes
 images/desc_order.gif | Bin 0 -> 843 bytes
 lib.inc.php3          |   5 ++++-
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 images/asc_order.gif
 create mode 100644 images/desc_order.gif

diff --git a/ChangeLog b/ChangeLog
index 6c55e96bb..44767925d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,9 @@ $Source$
 	  bit both the '$set$' switch cases.
 	* ldi_check.php3: fixed bug #448522 (Insert Data Error on Win32-Server).
 	* tbl_change.php3, lines 165 & 287: removed erroneous <lf>.
-	* lib.inc.php3, line 947: fix a bug when primary key values contain
-	  slashes.
+	* lib.inc.php3:
+        - line 947: fix a bug when primary key values contain slashes.
+        - merged patch #443393.
 
 2001-08-08  Steve Alberty  <alberty@neptunlabs.de>
 	* tbl_replace.php3: remove warning in a new row if a 'set' field is not
diff --git a/images/asc_order.gif b/images/asc_order.gif
new file mode 100644
index 0000000000000000000000000000000000000000..956bce53e3b1ef7ea2a5510164f44ddf310e1c9a
GIT binary patch
literal 842
zcmZ?wbhEHbWM^P!_|Cw<!o+gr(v?5I{#?0sCnqcC%C##DWeg0q3=HT0Fo^yC&+=cC
z;Xebz1_p)`=?u(_3=9eed^?OAQuG+&4H&}B8yNK%8jKhi4Hy^<<QNRQ7!<BD=&RIS
z%V&%hXE@Nnu%BVQA44Pq!+!?$CI*K87dMEqoM3QeW?*1oh?vg6C&IvB$H36#;K#6&
zfq|33Ac%p1;Q|9AJ4l{^fua9HOzZb9h7u5Wi%aUOPdX)F_TMdGHBBO33?OsTVi*`c
zF))-&XJ8OHGhzFyPhutf%nTX~3%(n_+HY2}&5R+Cv1yK}&`v{N4Fd)Sg*VF?{xdTC
zXORETV8W2jz>vVez`(=6$RNkyQ^UaK)jyq~wL^d*=L17miTeeHMgb9qZ43-74AcKG
zbTFLhXL_}<zT~Go!+w(m3>B{!c9pE}U=ZVHSi!*1$-wZPi9xEqem(<-IKwZ-{refj
zy`BHev0`9|`OgsEl<8T{;K!KilAP-wUl5+3A6!%vvo0}2tSEJVWv;kFL7Qj3NM3PI
z$;Mr&Kdp=QbLTNQq#87olrShTFu0{MWEL^x<T0eCG8C7v$0#s3yD{WvGUVl~D@heg
zEiTQAVJvZG(937=%wupZVK8N2h+$xGW?(R9V6doXaN}Tb|HTlspTRSM!Eg~nj2|dG
zeNMEoy%b?6DQ93{EDsaexSHX{4~CBY4CM*`8B6|yVyxl+o(Uo^c7TJwfkDkdKw{&E
z?+hjT8yFZm7#OyK3}I+sP-J)`&G>3NL&<&y2A%{DmkGW<8NBv4FzjGBBgyazq@ID{
zM}2b#hY-UrUxxh*G2RTX=e#Zfo0|KgUg8zU_mW@x8TOaI4%xWv&5fTW9s3y=7QA8z
z`_JI}pMjzN#uA5)us73vOF9@B8167I%w}Nt!@#hgf$2p((@PG9l3xrA`^^{_IvK(4
zVPII5&|tI3fY~pUfq`K?Lx7lp{&xnq{cH^83=ZlHZ{itBKni&r7`om}S19RFVNm?Z
z0@kSmB0+hAokN|0kwb=~!J&bHnTth0;DCY?BNwNN48z9-j&00rCOQp*4-YYMGBYt)
F0|1*d{~Z7T

literal 0
HcmV?d00001

diff --git a/images/desc_order.gif b/images/desc_order.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e2ecca496579cfae218fdd1456b320421aee8776
GIT binary patch
literal 843
zcmZ?wbhEHbWM^P!_|Cw<!o+gr(v?5I{#?0sCnqcC%C##EWeica3=HT0Fo^x{XZhdC
z@SlNU0|Uc}dIn}j1_m<&z6j$620aD_0|o{2h8=ngjz$cT1`G@aatwxD3<_5n^i>$H
z<ugQ!GaP7O*w3)uk0FwQ;Xea=69dEliyK5)PB6GKGcYhPL`-Mk6JcPmV_@iV@MGA?
zz`)615X8X1aDjo59VE}dz_9&8O!xOLh7u5Wi%aUOPdX)F_TMdGHBBO33?OsTVi*`c
zF))-&XJ8OHGhzFyPhutf%nTX~3%(n_+HY2}&5R+Cv1yK}&`v{N4Fd)Sh1bg&{xdTC
zXORETV8Sq+fuVzefq{pCkwK2Zr-p&eYkN9Fw~GKn&Ig9B68j4bn*~G}wlOfUFu4C=
zXk<9k&-7|zeaTOGhW#cBE>yf?-&F$A&(EO2!0>~Cp@fNnp}xL`f#Vayuaf=y8N|Jv
z|ID#sV2Jt85Z;vOS<c|cnCeoT>z`Z@9-kkaUlg-0F+{8=b$?~9xI#gjXTC^YaZky{
zU8z5<i}rKpF*u|eG?bJuC@?U%r7~m|G34Yiq^2?ym$1huFgUw0<YzME<*X}76-zBH
z&5L0yac0oVXYkBpa4lglWnhS5U~pz&FlS(}sAq8FU~vD%5VfDdGl9Wy5krh0C_FEm
zXk&jV!cbDqz`(d8O!WI|hLRr)4Eq`Obo~Fg^?wP&e};ztIu4>u8$pU08W^rv2z-3}
zp@gA?p@D&81H-4?;Am-JP-J)`&G>3NL&<&y2A&BXE<1dGGI;H8VA#QMMv~#xcd+=6
z`sNM}A%<VR4Eq^kycu54c?~j$fg$%ry~Hby?<K$XGwip29XfN{n;Sn%I`%U#EO^Nf
z_MgG`KLbPkjU^5pVQ<oXOI#Qj8167I%w}Nt19B(Ri+ZM)91JDD7#Q}OF)(y8g5Al$
zuqvU!W|0B2Unm0u!+M4QF$4YY3~u|`7|a<Q)EVByGn9Z7@;ESby-8OnaZzDV{K*2=
zsRJTGd4ioogMpccLt()IhGs?%5dj4Q2d5@RE*l$-1O>)MZtj>8jX;Kmeg#Gr76xko
Dr@sL+

literal 0
HcmV?d00001

diff --git a/lib.inc.php3 b/lib.inc.php3
index 691e0eff8..12fa00b63 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -871,12 +871,15 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
                 // 3. Do define the sorting url
                 if (!$is_in_sort) {
                     $sort_order = ' ORDER BY ' . backquote($field->name) . ' ' . $GLOBALS['cfgOrder'];
+                    $order_img  = '';
                 }
                 else if (substr($sql_order, -3) == 'ASC' && $is_in_sort) {
                     $sort_order = ' ORDER BY ' . backquote($field->name) . ' DESC';
+                    $order_img  = '&nbsp;<img src="./images/asc_order.gif" border="0" width="7" height="7" alt="ASC">';
                 }
                 else if (substr($sql_order, -4) == 'DESC' && $is_in_sort) {
                     $sort_order = ' ORDER BY ' . backquote($field->name) . ' ASC';
+                    $order_img  = '&nbsp;<img src="./images/desc_order.gif" border="0" width="7" height="7" alt="DESC">';
                 }
                 if (eregi('(.*)( LIMIT (.*)| PROCEDURE (.*)| FOR UPDATE| LOCK IN SHARE MODE)', $unsorted_sql_query, $regs3)) {
                     $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2];
@@ -892,7 +895,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
                 ?>
     <th>
         <a href="sql.php3?<?php echo $url_query; ?>">
-            <?php echo htmlspecialchars($field->name); ?></a>
+            <?php echo htmlspecialchars($field->name); ?></a><?php echo $order_img . "\n"; ?>
     </th>
                 <?php
             } // end if