优化

src/admin/ad_main.php

@@ -26,7 +26,7 @@ while ($arr = $dsql->GetArray('dd')) {
 $where_sql = ' 1=1';
 if ($clsid != 0) $where_sql .= " AND clsid = $clsid";
 if ($keyword != '') $where_sql .= " AND (ad.adname like '%$keyword%') ";
-$sql = "SELECT ad.aid,ad.clsid,ad.tagname,tp.typename as typename,ad.adname,ad.timeset,ad.endtime,ap.typename as clsname FROM `#@__myad` ad LEFT JOIN `#@__arctype` tp on tp.id=ad.typeid LEFT JOIN `#@__myadtype` ap on ap.id=ad.clsid WHERE $where_sql ORDER BY ad.aid desc";
+$sql = "SELECT ad.aid,ad.clsid,ad.tagname,tp.typename as typename,ad.adname,ad.timeset,ad.endtime,ap.typename as clsname FROM `#@__myad` ad LEFT JOIN `#@__arctype` tp on tp.id=ad.typeid LEFT JOIN `#@__myadtype` ap on ap.id=ad.clsid WHERE $where_sql ORDER BY ad.aid DESC";
 $dlist = new DataListCP();
 $dlist->SetTemplet(DEDEADMIN."/templets/ad_main.htm");
 $dlist->SetSource($sql);

src/admin/erraddsave.php

@@ -85,7 +85,7 @@ if ($dopost == "delete") {
     }
     exit();
 }
-$sql = "SELECT * FROM `#@__erradd` ORDER BY id desc";
+$sql = "SELECT * FROM `#@__erradd` ORDER BY id DESC";
 $dlist = new DataListCP();
 $dlist->SetTemplet(DEDEADMIN."/templets/erradd.htm");
 $dlist->SetSource($sql);

src/admin/freelist_main.php

@@ -70,7 +70,7 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid')
             <td>管理</td>
         </tr>\r\n";
     echo $printhead;
-    $dsql->SetQuery("SELECT aid,title,templet,click,edtime,namerule,listdir,defaultpage,nodefault From `#@__freelist` $addsql order by $orderby desc limit $start,$pagesize ");
+    $dsql->SetQuery("SELECT aid,title,templet,click,edtime,namerule,listdir,defaultpage,nodefault FROM `#@__freelist` $addsql ORDER BY $orderby DESC LIMIT $start,$pagesize");
     $dsql->Execute();
     while($row = $dsql->GetArray())
     {

src/admin/friendlink_main.php

@@ -22,7 +22,7 @@ if (empty($ischeck)) {
 }
 $keyword = HtmlReplace($keyword, -1);
 $selCheckArr = array(0 => '不限类型', -1 => '未审核', 1 => '内页', 2 => '首页');
-$sql = "SELECT * FROM `#@__flink` WHERE  CONCAT(`url`,`webname`,`email`) LIKE '%$keyword%' $ischeckSql ORDER BY dtime desc";
+$sql = "SELECT * FROM `#@__flink` WHERE CONCAT(`url`,`webname`,`email`) LIKE '%$keyword%' $ischeckSql ORDER BY dtime DESC";
 $dlist = new DataListCP();
 $dlist->SetParameter('keyword', $keyword);
 $dlist->SetParameter('ischeck', $ischeck);

src/admin/makehtml_all.php

@@ -72,9 +72,9 @@ else if ($step == 4) {
             exit();
         } else {
             if ($uptype == 'time') {
-                $query = "SELECT  DISTINCT typeid From `#@__arctiny` WHERE senddate >=".GetMkTime($mkvalue)." AND arcrank>-1";
+                $query = "SELECT DISTINCT typeid FROM `#@__arctiny` WHERE senddate >=".GetMkTime($mkvalue)." AND arcrank>-1";
             } else {
-                $query = "SELECT DISTINCT typeid From `#@__arctiny` WHERE id>=$mkvalue AND arcrank>-1";
+                $query = "SELECT DISTINCT typeid FROM `#@__arctiny` WHERE id>=$mkvalue AND arcrank>-1";
             }
             $dsql->SetQuery($query);
             $dsql->Execute();

src/admin/member_pm.php

@@ -31,7 +31,7 @@ if (!empty($keyword)) {
 if (!empty($username)) {
     $whereSql .= " AND floginid like '%".$username."%'";
 }
-$sql = "SELECT * FROM `#@__member_pms` $whereSql ORDER BY sendtime desc";
+$sql = "SELECT * FROM `#@__member_pms` $whereSql ORDER BY sendtime DESC";
 $dlist = new DataListCP();
 $dlist->pagesize = 30;
 $dlist->SetParameter("folder", $folder);

src/admin/mychannel_edit.php

@@ -360,7 +360,7 @@ else if ($dopost == "delete") {
         }
         //检查频道的表是否独占数据表
         $addtable = str_replace($cfg_dbprefix, '', str_replace('#@__', $cfg_dbprefix, $myrow['addtable']));
-        $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE  addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ; ");
+        $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ; ");
         $isExclusive2 = ($row['dd'] > 1 ? 0 : 1);
         //获取与频道关连的所有栏目id
         $tids = '';

src/admin/recycling.php

@@ -19,7 +19,7 @@ if ($cid != 0) {
     require_once(DEDEINC.'/channelunit.func.php');
     $whereSql = " AND arc.typeid IN (".GetSonIds($cid).")";
 }
-$query = "SELECT arc.*,tp.typename FROM `#@__archives` AS arc LEFT JOIN `#@__arctype` AS tp ON arc.typeid = tp.id WHERE arc.arcrank = '-2' $whereSql order by arc.id desc";
+$query = "SELECT arc.*,tp.typename FROM `#@__archives` AS arc LEFT JOIN `#@__arctype` AS tp ON arc.typeid = tp.id WHERE arc.arcrank = '-2' $whereSql ORDER BY arc.id DESC";
 $dlist = new DataListCP();
 $dlist->SetTemplet(DEDEADMIN."/templets/recycling.htm");
 $dlist->SetSource($query);

src/admin/stepselect_main.php

@@ -185,7 +185,7 @@ else if ($action == 'addenum_save') {
     if ($issign == 1 || $topvalue == 0) {
         $enames = explode(',', $ename);
         foreach ($enames as $ename) {
-            $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND (evalue MOD 500)=0 ORDER BY disorder DESC ");
+            $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND (evalue MOD 500)=0 ORDER BY disorder DESC");
             if (!is_array($arr)) $disorder = $evalue = ($issign == 1 ? 1 : 500);
             else $disorder = $evalue = $arr['disorder'] + ($issign == 1 ? 1 : 500);
             $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) 
@@ -199,7 +199,7 @@ else if ($action == 'addenum_save') {
         $maxnum = 500; //三级子类最多500个
         $enames = explode(',', $ename);
         foreach ($enames as $ename) {
-            $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue LIKE '$topvalue.%%%' ORDER BY evalue DESC ");
+            $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue LIKE '$topvalue.%%%' ORDER BY evalue DESC");
             if (!is_array($arr)) {
                 $disorder = $minid;
                 $evalue = $minid.'.001';
@@ -224,7 +224,7 @@ else if ($action == 'addenum_save') {
         $maxid = $topvalue + 500;
         $enames = explode(',', $ename);
         foreach ($enames as $ename) {
-            $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue>$minid AND evalue<$maxid ORDER BY evalue DESC ");
+            $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue>$minid AND evalue<$maxid ORDER BY evalue DESC");
             if (!is_array($arr)) {
                 $disorder = $evalue = $minid + 1;
             } else {
@@ -247,7 +247,7 @@ else if ($action == 'upenum') {
     $ename = trim(preg_replace("# └─(─){1,}#", '', $ename));
     $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$aid' ");
     WriteEnumsCache($row['egroup']);
-    $dsql->ExecuteNoneQuery("UPDATE `#@__sys_enum` SET `ename`='$ename',`disorder`='$disorder' WHERE id='$aid'; ");
+    $dsql->ExecuteNoneQuery("UPDATE `#@__sys_enum` SET `ename`='$ename',`disorder`='$disorder' WHERE id='$aid';");
     ShowMsg("成功修改一个枚举", $ENV_GOBACK_URL);
     exit();
 }

src/admin/sys_info.php

@@ -23,7 +23,7 @@ function ReWriteConfig()
     $fp = fopen($configfile, 'w');
     flock($fp, 3);
     fwrite($fp, "<"."?php\r\n");
-    $dsql->SetQuery("SELECT `varname`,`type`,`value`,`groupid` FROM `#@__sysconfig` ORDER BY aid ASC ");
+    $dsql->SetQuery("SELECT `varname`,`type`,`value`,`groupid` FROM `#@__sysconfig` ORDER BY aid ASC");
     $dsql->Execute();
     while ($row = $dsql->GetArray()) {
         if ($row['type'] == 'number') {
@@ -72,7 +72,7 @@ else if ($dopost == 'add') {
         ShowMsg("该变量名称已经存在", "-1");
         exit();
     }
-    $row = $dsql->GetOne("SELECT aid FROM `#@__sysconfig` ORDER BY aid DESC ");
+    $row = $dsql->GetOne("SELECT aid FROM `#@__sysconfig` ORDER BY aid DESC");
     $aid = $row['aid'] + 1;
     $inquery = "INSERT INTO `#@__sysconfig` (`aid`,`varname`,`info`,`value`,`type`,`groupid`) VALUES ('$aid','$nvarname','$varmsg','$nvarvalue','$vartype','$vargroup')";
     $rs = $dsql->ExecuteNoneQuery($inquery);
@@ -104,7 +104,7 @@ else if ($dopost == 'search') {
 EOT;
     echo $configstr;
     if ($keywords) {
-        $dsql->SetQuery("SELECT * FROM `#@__sysconfig` WHERE info LIKE '%$keywords%' OR varname LIKE '%$keywords%' order by aid asc");
+        $dsql->SetQuery("SELECT * FROM `#@__sysconfig` WHERE info LIKE '%$keywords%' OR varname LIKE '%$keywords%' ORDER BY aid ASC");
         $dsql->Execute();
         while ($row = $dsql->GetArray()) {
             $bgcolor = ($i++ % 2 == 0) ? "#f8f8f8" : "#ffffff";

src/admin/templets/album_add.htm

@@ -89,7 +89,7 @@
               <td width="90">自定义属性：</td>
               <td>
               <?php
-              $dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+              $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
               $dsql->Execute();
               while($trow = $dsql->GetObject())
               {

src/admin/templets/archives_add.htm

@@ -68,7 +68,7 @@
               <td width="90">自定义属性：</td>
               <td>
               <?php
-            	$dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+            	$dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             	$dsql->Execute();
             	while($trow = $dsql->GetObject())
             	{

src/admin/templets/archives_sg_add.htm

@@ -67,7 +67,7 @@
               <td width="90">自定义属性：</td>
               <td>
               	<?php
-              	$dsql->SetQuery("SELECT * FROM `#@__arcatt` where att<>'j' And att<>'p' order by sortid asc");
+              	$dsql->SetQuery("SELECT * FROM `#@__arcatt` WHERE att<>'j' And att<>'p' ORDER BY sortid ASC");
               	$dsql->Execute();
               	while($trow = $dsql->GetObject())
               	{

src/admin/templets/article_add.htm

@@ -90,7 +90,7 @@
               <td width="90">自定义属性：</td>
               <td align="left">
               <?php
-            	$dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+            	$dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             	$dsql->Execute();
             	while($trow = $dsql->GetObject())
             	{

src/admin/templets/content_att.htm

@@ -24,7 +24,7 @@
         <td width="70%">属性名称</td>
       </tr>
       <?php
-    	$dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc ");
+    	$dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
     	$dsql->Execute();
     	$k=0;
     	while($row = $dsql->GetObject())

src/admin/templets/member_toadmin.htm

@@ -67,7 +67,7 @@
               <td class="biz-td">
                 <select name='usertype' class='biz-input-sm'>
                 <?php
-                $dsql->SetQuery("SELECT * FROM `#@__admintype` order by `rank` asc");
+                $dsql->SetQuery("SELECT * FROM `#@__admintype` ORDER BY `rank` ASC");
                 $dsql->Execute("ut");
                 while($myrow = $dsql->GetObject("ut"))
                 {

src/admin/templets/soft_add.htm

@@ -82,7 +82,7 @@
             <tr>
               <td width="90">自定义属性：</td>
               <td><?php
-              $dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+              $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
               $dsql->Execute();
               while($trow = $dsql->GetObject())
               {

src/admin/templets/soft_edit.htm

@@ -78,7 +78,7 @@
               <td width="90">自定义属性：</td>
               <td>
               <?php
-		          $dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+		          $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
 		          $dsql->Execute();
 		          while($trow = $dsql->GetObject())
 		          {

src/admin/templets/spec_add.htm

@@ -106,7 +106,7 @@
             <tr>
               <td width="90">自定义属性：</td>
               <td><?php
-            	$dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+            	$dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             	$dsql->Execute();
             	while($trow = $dsql->GetObject())
             	{

src/admin/templets/spec_edit.htm

@@ -104,7 +104,7 @@
               <td width="90">自定义属性：</td>
               <td>
                 <?php
-                $dsql->SetQuery("SELECT * FROM `#@__arcatt` order by sortid asc");
+                $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
                 $dsql->Execute();
                 while($trow = $dsql->GetObject())
                 {

src/admin/templets/stepselect_showajax.htm

@@ -31,7 +31,7 @@ if ($arr['issystem']==0) $sbjs = '';
 <?php
 } else if ($action=='addenum') {
 $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE id='$id' ");
-$dsql->Execute('out',"Select evalue,ename from `#@__sys_enum` where egroup='{$arr['egroup']}' And (evalue mod 500)=0  order by disorder asc,evalue asc");
+$dsql->Execute('out',"SELECT evalue,ename FROM `#@__sys_enum` WHERE egroup='{$arr['egroup']}' AND (evalue mod 500)=0 ORDER BY disorder ASC,evalue ASC");
 $options = '';
 if ($arr['issign']==0)
 {

src/admin/templets/sys_admin_user_edit.htm

@@ -44,7 +44,7 @@
               <td class="biz-td">
                 <select name="usertype" class="biz-input-sm">
                 <?php
-                $dsql->SetQuery("SELECT * FROM `#@__admintype` order by `rank` asc");
+                $dsql->SetQuery("SELECT * FROM `#@__admintype` ORDER BY `rank` ASC");
                 $dsql->Execute("ut");
                 while($myrow = $dsql->GetObject("ut"))
                 {

src/admin/templets/sys_admin_user_tj.htm

@@ -38,7 +38,7 @@
   <tr>
     <td>
     <?php
-    $dsql->Execute('me', 'SELECT * FROM `#@__admin` order by id asc');
+    $dsql->Execute('me', 'SELECT * FROM `#@__admin` ORDER BY id ASC');
     while( $arr = $dsql->GetArray('me') )
     {
   	  echo "<div id='userct{$arr['id']}' class='userct'><p align='center'><img src='../static/web/img/loadinglit.gif'>正在加载</p></div><script>LoadUser({$arr['id']});</script>";

src/admin/vote_edit.php

@@ -38,7 +38,7 @@ if ($dopost == "delete") {
         view='$view',
         spec='$spec',
         isenable='$isenable'
-       WHERE aid='$aid'";
+      WHERE aid='$aid'";
     if ($dsql->ExecuteNoneQuery($query)) {
         $vt = new DedeVote($aid);
         $vote_file = DEDEDATA."/vote/vote_".$aid.".js";

src/apps/search.php

@@ -31,7 +31,7 @@ if (empty($typeid)) {
     if (!file_exists($typenameCacheFile) || filemtime($typenameCacheFile) < time() - (3600 * 24)) {
         $fp = fopen(DEDEDATA.'/cache/typename.inc', 'w');
         fwrite($fp, "<"."?php\r\n");
-        $dsql->SetQuery("Select id,typename,channeltype From `#@__arctype`");
+        $dsql->SetQuery("SELECT id,typename,channeltype FROM `#@__arctype`");
         $dsql->Execute();
         while ($row = $dsql->GetArray()) {
             fwrite($fp, "\$typeArr[{$row['id']}] = '{$row['typename']}';\r\n");
@@ -72,7 +72,7 @@ if (is_array($row)) {
         ShowMsg('管理员设定搜索时间间隔为'.$cfg_search_time.'秒，请稍后再试', '-1');
         exit;
     }
-    $dsql->ExecuteNoneQuery("UPDATE `#@__search_limits` SET `searchtime`='{$now}' WHERE  `ip`='{$ip}';");
+    $dsql->ExecuteNoneQuery("UPDATE `#@__search_limits` SET `searchtime`='{$now}' WHERE `ip`='{$ip}';");
 } else {
     $dsql->ExecuteNoneQuery("INSERT INTO `#@__search_limits` (`ip`, `searchtime`) VALUES ('{$ip}', '{$now}');");
 }

src/apps/showphoto.php

@@ -17,7 +17,7 @@ if ($aid == 0) die("dedebiz");
 $arctitle = '';
 $arcurl = '';
 $topid = 0;
-$arcRow = $dsql->GetOne("SELECT arc.title,arc.senddate,arc.arcrank,arc.ismake,arc.money,arc.typeid,tp.topid,tp.typedir,tp.namerule,tp.moresite,tp.siteurl,tp.sitepath FROM `#@__archives` arc  LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid WHERE arc.id='$aid'");
+$arcRow = $dsql->GetOne("SELECT arc.title,arc.senddate,arc.arcrank,arc.ismake,arc.money,arc.typeid,tp.topid,tp.typedir,tp.namerule,tp.moresite,tp.siteurl,tp.sitepath FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid WHERE arc.id='$aid'");
 if (is_array($arcRow)) {
     $arctitle = $arcRow['title'];
     $topid = $arcRow['topid'];

src/system/archive/freelist.class.php

@@ -457,15 +457,15 @@ class FreeList
         } else if ($orderby == "pubdate") {
             $ordersql = " ORDER BY arc.pubdate $orderWay";
         } else if ($orderby == "id") {
-            $ordersql = "  ORDER BY arc.id $orderWay";
+            $ordersql = " ORDER BY arc.id $orderWay";
         } else if ($orderby == "hot" || $orderby == "click") {
             $ordersql = " ORDER BY arc.click $orderWay";
         } else if ($orderby == "lastpost") {
-            $ordersql = "  ORDER BY arc.lastpost $orderWay";
+            $ordersql = " ORDER BY arc.lastpost $orderWay";
         } else if ($orderby == "scores") {
-            $ordersql = "  ORDER BY arc.scores $orderWay";
+            $ordersql = " ORDER BY arc.scores $orderWay";
         } else if ($orderby == "rand") {
-            $ordersql = "  ORDER BY rand()";
+            $ordersql = " ORDER BY rand()";
         } else {
             $ordersql = " ORDER BY arc.sortrank $orderWay";
         }

src/system/archive/listview.class.php

@@ -617,7 +617,7 @@ class ListView
         } else if ($orderby == "hot" || $orderby == "click") {
             $ordersql = " ORDER BY arc.click $orderWay";
         } else if ($orderby == "lastpost") {
-            $ordersql = "  ORDER BY arc.lastpost $orderWay";
+            $ordersql = " ORDER BY arc.lastpost $orderWay";
         } else {
             $ordersql = " ORDER BY arc.sortrank $orderWay";
         }

src/system/archive/searchview.class.php

@@ -529,7 +529,7 @@ class SearchView
             } else if ($orderby == "pubdate") {
                 $ordersql = " ORDER BY arc.pubdate desc";
             } else if ($orderby == "id") {
-                $ordersql = "  ORDER BY arc.id desc";
+                $ordersql = " ORDER BY arc.id desc";
             } else {
                 $ordersql = " ORDER BY arc.sortrank desc";
             }

src/system/archive/specview.class.php

@@ -327,7 +327,7 @@ class SpecView
         } else if ($orderby == 'pubdate') {
             $ordersql = " ORDER BY arc.pubdate desc";
         } else if ($orderby == 'id') {
-            $ordersql = "  ORDER BY arc.id desc";
+            $ordersql = " ORDER BY arc.id desc";
         } else {
             $ordersql = " ORDER BY arc.sortrank desc";
         }

src/system/archive/taglist.class.php

@@ -301,7 +301,7 @@ class TagList
         $orwhere = " se.id IN($idlists) ";
         //排序方式
         if ($orderby == "sortrank") {
-            $ordersql = "  ORDER BY se.sortrank $orderWay";
+            $ordersql = " ORDER BY se.sortrank $orderWay";
         } else {
             $ordersql = " ORDER BY se.id $orderWay";
         }

src/system/taglib/arclist.lib.php

@@ -238,14 +238,14 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
     $ordersql = '';
     if ($orderby == 'hot' || $orderby == 'click') $ordersql = " ORDER BY arc.click $orderWay";
     else if ($orderby == 'sortrank' || $orderby == 'pubdate') $ordersql = " ORDER BY arc.sortrank $orderWay";
-    else if ($orderby == 'id') $ordersql = "  ORDER BY arc.id $orderWay";
+    else if ($orderby == 'id') $ordersql = " ORDER BY arc.id $orderWay";
     else if ($orderby == 'near') $ordersql = " ORDER BY ABS(arc.id - ".$arcid.")";
-    else if ($orderby == 'lastpost') $ordersql = "  ORDER BY arc.lastpost $orderWay";
-    else if ($orderby == 'scores') $ordersql = "  ORDER BY arc.scores $orderWay";
+    else if ($orderby == 'lastpost') $ordersql = " ORDER BY arc.lastpost $orderWay";
+    else if ($orderby == 'scores') $ordersql = " ORDER BY arc.scores $orderWay";
     //增加按好评数和差评数调用
     else if ($orderby == 'goodpost') $ordersql = " order by arc.goodpost $orderWay";
     else if ($orderby == 'badpost') $ordersql = " order by arc.badpost $orderWay";
-    else if ($orderby == 'rand') $ordersql = "  ORDER BY rand()";
+    else if ($orderby == 'rand') $ordersql = " ORDER BY rand()";
     else $ordersql = " ORDER BY arc.sortrank $orderWay";
     //limit条件
     $limit = trim(preg_replace('#limit#is', '', $limit));

src/system/taglib/arclistsg.lib.php

@@ -112,9 +112,9 @@ function lib_arclistsg(&$ctag, &$refObj)
     //文档排序的方式
     $ordersql = '';
     if ($orderby == 'hot' || $orderby == 'click') $ordersql = " ORDER BY arc.click $orderway";
-    else if ($orderby == 'id') $ordersql = "  ORDER BY arc.aid $orderway";
+    else if ($orderby == 'id') $ordersql = " ORDER BY arc.aid $orderway";
     else if ($orderby == 'near') $ordersql = " ORDER BY ABS(arc.id - ".$arcid.")";
-    else if ($orderby == 'rand') $ordersql = "  ORDER BY rand()";
+    else if ($orderby == 'rand') $ordersql = " ORDER BY rand()";
     else $ordersql = " ORDER BY arc.aid $orderway";
     //limit条件
     $limit = trim(preg_replace('#limit#i', '', $limit));
@@ -248,7 +248,7 @@ function lib_GetAutoChannelID2($sortid, $topid)
     global $dsql;
     if (empty($sortid)) $sortid = 1;
     $getstart = $sortid - 1;
-    $row = $dsql->GetOne("SELECT id,typename From `#@__arctype` WHERE reid='{$topid}' AND ispart<2 AND ishidden<>'1' ORDER BY sortrank asc limit $getstart,1");
+    $row = $dsql->GetOne("SELECT id,typename From `#@__arctype` WHERE reid='{$topid}' AND ispart<2 AND ishidden<>'1' ORDER BY sortrank ASC LIMIT $getstart,1");
     if (!is_array($row)) return 0;
     else return $row['id'];
 }

src/system/taglib/autochannel.lib.php

@@ -23,12 +23,11 @@ function lib_autochannel(&$ctag, &$refObj)
     }
     if (empty($sortid)) $sortid = 1;
     $getstart = $sortid - 1;
-    $row = $dsql->GetOne("SELECT id,typename FROM `#@__arctype` WHERE reid='{$topid}' AND ispart<2 AND ishidden<>'1' ORDER BY sortrank asc limit $getstart,1");
+    $row = $dsql->GetOne("SELECT id,typename FROM `#@__arctype` WHERE reid='{$topid}' AND ispart<2 AND ishidden<>'1' ORDER BY sortrank ASC LIMIT $getstart,1");
     if (!is_array($row)) return '';
     else $typeid = $row['id'];
     if (trim($innertext) == '') $innertext = GetSysTemplets('part_autochannel.htm');
-    $row = $dsql->GetOne("SELECT id,typedir,isdefault,defaultname,ispart,namerule2,typename,moresite,siteurl,sitepath 
-       FROM `#@__arctype` WHERE id='$typeid' ");
+    $row = $dsql->GetOne("SELECT id,typedir,isdefault,defaultname,ispart,namerule2,typename,moresite,siteurl,sitepath FROM `#@__arctype` WHERE id='$typeid' ");
     if (!is_array($row)) return '';
     $dtp = new DedeTagParse();
     $dtp->SetNameSpace('field', '[', ']');

src/system/taglib/channel.lib.php

@@ -49,13 +49,13 @@ function lib_channel(&$ctag, &$refObj)
     if ($type == '' || $type == 'sun') $type = 'son';
     if ($innertext == '') $innertext = GetSysTemplets("channel_list.htm");
     if ($type == 'top') {
-        $sql = "SELECT * FROM `#@__arctype` WHERE reid=0 And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * FROM `#@__arctype` WHERE reid=0 AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0, $line";
     } else if ($type == 'son') {
         if ($typeid == 0) return '';
-        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$typeid' And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0, $line";
     } else if ($type == 'self') {
         if ($reid == 0) return '';
-        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$reid' And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0, $line";
     }
     $needRel = false;
     $dtp2 = new DedeTagParse();
@@ -69,7 +69,7 @@ function lib_channel(&$ctag, &$refObj)
     $totalRow = $dsql->GetTotalRow();
     //如果用子栏目模式，当没有子栏目时显示同级栏目
     if ($type == 'son' && $reid != 0 && $totalRow == 0) {
-        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$reid' And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0, $line";
         $dsql->SetQuery($sql);
         $dsql->Execute();
     }

src/system/taglib/memberlist.lib.php

@@ -21,7 +21,7 @@ function lib_memberlist(&$ctag, &$refObj)
     if (empty($innerText)) $innerText = GetSysTemplets('memberlist.htm');
     $wheresql = ' WHERE mb.spacesta>-1 AND mb.matt<10 ';
     if ($iscommend > 0) $wheresql .= " AND  mb.matt='$iscommend' ";
-    $sql = "SELECT mb.*,ms.spacename,ms.sign FROM `#@__member` mb LEFT JOIN `#@__member_space` ms ON ms.mid = mb.mid $wheresql order by mb.{$orderby} DESC LIMIT 0,$row ";
+    $sql = "SELECT mb.*,ms.spacename,ms.sign FROM `#@__member` mb LEFT JOIN `#@__member_space` ms ON ms.mid = mb.mid $wheresql ORDER BY mb.{$orderby} DESC LIMIT 0,$row ";
     $ctp = new DedeTagParse();
     $ctp->SetNameSpace('field', '[', ']');
     $ctp->LoadSource($innerText);

src/system/taglib/sonchannel.lib.php

@@ -19,8 +19,7 @@ function lib_sonchannel(&$ctag, &$refObj)
     if (empty($typeid)) {
         return $ctag->GetAtt('nosonmsg');
     }
-    $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath
-   FROM `#@__arctype` WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0,$row";
+    $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath FROM `#@__arctype` WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0,$row";
     //And id<>'$typeid'
     $dtp2 = new DedeTagParse();
     $dtp2->SetNameSpace("field", "[", "]");

src/theme/plus/flink-list.htm

@@ -28,7 +28,7 @@
 					<?php
 					$row = 180;
 					$titlelen = 50;
-					$dsql->SetQuery("SELECT * FROM `#@__flink` where ischeck>0 order by sortrank asc");
+					$dsql->SetQuery("SELECT * FROM `#@__flink` WHERE ischeck>0 ORDER BY sortrank ASC");
 					$dsql->Execute();
 					$revalue = "";
 					for($i=1;$i<=$row;$i++)

src/theme/plus/heightsearch.htm

@@ -50,7 +50,7 @@
 									<select name="channeltype" id="channeltype" class="form-control">
 										<option value="0" selected>不限</option>
 										<?php
-										$dsql->SetQuery("Select id,typename From `#@__channeltype` order by id desc");
+										$dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` ORDER BY id DESC");
 										$dsql->Execute();
 										while($row = $dsql->GetObject())
 										{

src/user/inc/inc_archives_functions.php

@@ -126,12 +126,10 @@ function SaveUploadInfo($title, $filename, $medaitype = 1, $addinfos = '')
     $row = $dsql->GetOne("SELECT aid,title,url FROM `#@__uploads` WHERE url LIKE '$filename' AND mid='".$cfg_ml->M_ID."'; ");
     $uptime = time();
     if (is_array($row)) {
-        $query = "UPDATE `#@__uploads` SET title='$title',mediatype='$medaitype',width='{$addinfos[0]}',height='{$addinfos[1]}',filesize='{$addinfos[2]}',uptime='$uptime'
-           WHERE aid='{$row['aid']}'; ";
+        $query = "UPDATE `#@__uploads` SET title='$title',mediatype='$medaitype',width='{$addinfos[0]}',height='{$addinfos[1]}',filesize='{$addinfos[2]}',uptime='$uptime' WHERE aid='{$row['aid']}';";
         $dsql->ExecuteNoneQuery($query);
     } else {
-        $inquery = "INSERT INTO `#@__uploads`(title,url,mediatype,width,height,playtime,filesize,uptime,mid)
-           VALUES ('$title','$filename','$medaitype','".$addinfos[0]."','".$addinfos[1]."','0','".$addinfos[2]."','$uptime','".$cfg_ml->M_ID."'); ";
+        $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('$title','$filename','$medaitype','".$addinfos[0]."','".$addinfos[1]."','0','".$addinfos[2]."','$uptime','".$cfg_ml->M_ID."');";
         $dsql->ExecuteNoneQuery($inquery);
     }
     $fid = $dsql->GetLastID();
@@ -247,8 +245,8 @@ function MakeArt($aid, $ismakesign = FALSE)
     $arc = new Archives($aid);
     $reurl = $arc->MakeHtml();
     if (isset($typeid)) {
-        $preRow =  $arc->dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id<$aid AND arcrank>-1 AND typeid='$typeid' order by id desc");
-        $nextRow = $arc->dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id>$aid AND arcrank>-1 AND typeid='$typeid' order by id asc");
+        $preRow =  $arc->dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id<$aid AND arcrank>-1 AND typeid='$typeid' ORDER BY id DESC");
+        $nextRow = $arc->dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id>$aid AND arcrank>-1 AND typeid='$typeid' ORDER BY id ASC");
         if (is_array($preRow)) {
             $arc = new Archives($preRow['id']);
             $arc->MakeHtml();

src/user/inc/inc_catalog_options.php

@@ -26,7 +26,7 @@ function GetOptionList($selid = 0, $channeltype = 0)
         $channels[$row->id] = $row->typename;
     }
     $OptionArrayList = "";
-    $query = "SELECT id,typename,ispart,channeltype,issend FROM `#@__arctype` WHERE ispart<2 AND reid=0 ORDER BY sortrank ASC ";
+    $query = "SELECT id,typename,ispart,channeltype,issend FROM `#@__arctype` WHERE ispart<2 AND reid=0 ORDER BY sortrank ASC";
     $dsql->SetQuery($query);
     $dsql->Execute();
     $selected = '';
@@ -60,7 +60,7 @@ function LogicGetOptionArray($id, $step, $channeltype, $selid = 0)
 {
     global $OptionArrayList, $channels, $dsql;
     $selected = '';
-    $dsql->SetQuery("Select id,typename,ispart,channeltype,issend From `#@__arctype` where reid='".$id."' And ispart<2 order by sortrank asc");
+    $dsql->SetQuery("SELECT id,typename,ispart,channeltype,issend FROM `#@__arctype` WHERE reid='".$id."' AND ispart<2 ORDER BY sortrank ASC");
     $dsql->Execute($id);
     while ($row = $dsql->GetObject($id)) {
         if ($selid == $row->id) {

src/user/mystow.php

@@ -17,10 +17,10 @@ $tpl = '';
 $menutype = 'mydede';
 $rank = empty($rank) ? "" : $rank;
 if ($rank == 'top') {
-    $sql = "SELECT s.*,COUNT(s.aid) AS num,t.* FROM `#@__member_stow` AS s LEFT JOIN `#@__member_stowtype` AS t on t.stowname=s.type group by s.aid order by num desc";
+    $sql = "SELECT s.*,COUNT(s.aid) AS num,t.* FROM `#@__member_stow` AS s LEFT JOIN `#@__member_stowtype` AS t on t.stowname=s.type GROUP BY s.aid ORDER BY num DESC";
     $tpl = 'mystowtop';
 } else {
-    $sql = "SELECT s.*,t.* FROM `#@__member_stow` AS s left join `#@__member_stowtype` AS t on t.stowname=s.type WHERE s.mid='".$cfg_ml->M_ID."' order by s.id desc";
+    $sql = "SELECT s.*,t.* FROM `#@__member_stow` AS s LEFT JOIN `#@__member_stowtype` AS t on t.stowname=s.type WHERE s.mid='".$cfg_ml->M_ID."' ORDER BY s.id DESC";
     $tpl = 'mystow';
 }
 $dsql->Execute('nn', 'SELECT indexname,stowname FROM `#@__member_stowtype`');