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 6c55e96bbc..44767925dc 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
zcmW-gO=weD6vuxr2~FA&jS^F5Ml?cE7p10JtBy00nby=)6Te$O0*&aiRMJG!s~JJe
zvx6lQ2HIT~Q?Q7jD6|b|ts*>e)kVP%V(G$-yZV|%r<<6N;dzs@IGl6tx&L#{|DM|w
z@b5ox$&Q^O*etgE$9$z+$uE44UW?`z^4x^q;9Ui`Y1+(<m@o}<{a6+7c-PME(XO=6
z=cRX_rnI2#M)87o3#}PEpV-xOXCba!Y~+oG&Qyr=NC^9|)E}ld+U7WHMasD>Yh7>%
zGQJQmp&suk8GnyrubxX8T?yYSW)M~TS*L2OHjA45|FfRk!>(?sI9J243L*=x`LP$q
zs#~nHvXhD89z$;zGwqyIhR64Ac-b1<DZBI(9$_l7pRFcs^g~2qtU+N5$8J;CJ(}fS
z+DUYUjOcpLU8jo~NfOx#Y34^QMlK~vThZGl_|xE(m`dYb$7A>#iWYuKrS9Wsq^#&V
zjYm5w<G(=Iq<45AkR+t2otFoX_g(Le$4@5`;mJ#9+zC~`HQ4C6J`#w#VnhFk+$*(o
zFroht!>4*RIj;x&Dgz0kF;tZyVGn!g@Dm>(7M&ETTOGO)3oD|7mN<bJhXs3OP3VAq
zus?<0L06dzI)MnS4+w|k$Q+v+sr%|eBtc2`xN=Wf{6<<Q88H<hU))49Uyr$#W^43o
zZ1*`g<yMLaT|-jA^C}1$+bI037%ya8@)$YNITkF@Epuj>{}H2_58qOMr5zh62jxD5
zkFq?zENZBOOQ}tUqbSNcdUE+pZl<tU60!#-40=q0vW?W@Ltnb5kPQl1lh5!kRFF89
zrIh8X15uVvyQE*PW=)<%v|k^1t)a8ho8pAqyQ_#_uai{xc2MX;R1??u$P}_3k#1sJ
z$yU49T-DV-VR!66acp*IJ`HPw&FOsO`9o=_Z`#a%6TgpG>)M*N^<Umv>a7+Ieg~T~
B{~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
zcmW-gUuaWz6vsa|3FdAsS|m*sL9ZYz52dD4Yn@fIHKwMTIOnW?cEQTHmP(pP`|}?Z
z?lm&WqEO#N>_d@(pr9>wZFR!+u@8lHBP%}mwilb`q2?tfWZeC3&corH^E>Bz{{H&n
zvF-zx{P?MW&*LlnU8vXUg_RGfE2+Xt!Me_cL-1#vpfllfe!+ohSTyk}&=uZzZjVI=
zgwgg}3mts>HRr=p-A-p7?H_jUVkN^*ZM?Ivd70!q62hOA{IBU&-y%o7NILhBjR80e
z`ACx2@CD%?q<tC1@4ic#U)S$d@(5R+jT*&ryJ*P&%?^xb1O2!-mvtzEcnE=|2lK^p
zP;BxNVyd#IXm^RZE>0=g$$gt&cP2uzN^R{ajw0*X;jkAOl#>|EC~W7%I2-!shqxDQ
zA+=6k99ia7ODl77Nc7dY&C-OYIAe<H4(z>C%QuVuH^PnIB-8O(*5Cot97iov6Shs;
z@!tC6H=sM5%?`(JkW`H5*vQGBub#b_Ih`5RUtIbzIBM9pM%uKicjK8rdhEWKd1F)$
zj@nIWB1YJf{b~?17#<~+#xNKYeqEzCMrN3F>V+_Z#@MyAu83YbGQ`sy73`Bap%?Z;
zw@FN;uf_$N_#mB6(37%dmKX2(R|AL}peziuR-Pkd3pQ_a&ZplUAtz)x?UB~(jO&a=
zp}XbNzw1IS!$O^={6}Lg7CR|zQ;PElTh8&pvFJjgO22Kfz|vNVm4^MZc_*iCrk0TS
z`f=7K*IXPJ`Dkt_sufYQv5%~sc{EpgUllnCG_}frLqZ;&`Tn;^ZlE-j5K$TM0Ukr$
zt<&?-^sK6gnpC>rS9zKZdNyeFJPCV~XQcL$?}Opp6=L=VIf}?vlrAD%$L0w6(vT*i
zyVzOvHR9S`?*0kC8p7MGYE$pHqo{!vEgbnSt9;qh6B^W%+f7Zn2%W;3&=jAKgZ~4k
CzX3A<

literal 0
HcmV?d00001

diff --git a/lib.inc.php3 b/lib.inc.php3
index 691e0eff8c..12fa00b63d 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