Merge remote-tracking branch 'origin/test' into test

e/config/config.php

@@ -408,7 +408,7 @@ $emod_r[1]=Array('mid'=>1,
 'qeditdofunf'=>'||',
 'definfovoteid'=>0,
 'orderf'=>'',
-'sonclass'=>'|2|3|10|28|11|12|13|14|15|16|29|32|',
+'sonclass'=>'|',
 'tid'=>1,
 'tbname'=>'news');
 $emod_r[2]=Array('mid'=>2,

environments/prod/e/config/config.php

@@ -328,6 +328,211 @@ $emoreport_r=array();
 //moreports
 
 
+//***************** 以下部分为缓存，不用设置 **************
+//***************** 以下部分为缓存，不用设置 **************
+
+//-------EmpireCMS.Public.Cache-------
+
+//------------e_public
+$public_r=array('sitename'=>'扳手 - 和百万家电维修人在一起',
+    'newsurl'=>'/',
+    'filetype'=>'|.gif|.jpg|.jpeg|.swf|.rar|.zip|.mp3|.mp4|.wmv|.txt|.doc|',
+    'filesize'=>2048,
+    'relistnum'=>8,
+    'renewsnum'=>100,
+    'min_keyboard'=>2,
+    'max_keyboard'=>20,
+    'search_num'=>20,
+    'search_pagenum'=>10,
+    'newslink'=>0,
+    'checked'=>0,
+    'searchtime'=>30,
+    'loginnum'=>20,
+    'logintime'=>60,
+    'addnews_ok'=>0,
+    'register_ok'=>0,
+    'indextype'=>'.html',
+    'goodlencord'=>0,
+    'goodtype'=>'',
+    'searchtype'=>'.html',
+    'exittime'=>40,
+    'smalltextlen'=>160,
+    'defaultgroupid'=>1,
+    'fileurl'=>'https://imgs.ibanshou.cn/d/file/',
+    'install'=>0,
+    'phpmode'=>0,
+    'dorepnum'=>300,
+    'loadtempnum'=>50,
+    'bakdbpath'=>'bdata',
+    'bakdbzip'=>'zip',
+    'downpass'=>'PuYKEOVfEoEjU1ZWbNhQ',
+    'filechmod'=>1,
+    'loginkey_ok'=>0,
+    'tbname'=>'news',
+    'limittype'=>0,
+    'redodown'=>1,
+    'downsofttemp'=>'[ <a href=\"#ecms\" onclick=\"window.open(\'[!--down.url--]\',\'\',\'width=300,height=300,resizable=yes\');\">[!--down.name--]</a> ]',
+    'onlinemovietemp'=>'[ <a href=\"#ecms\" onclick=\"window.open(\'[!--down.url--]\',\'\',\'width=300,height=300,resizable=yes\');\">[!--down.name--]</a> ]',
+    'lctime'=>1222406370,
+    'candocode'=>1,
+    'opennotcj'=>0,
+    'listpagetemp'=>'页次：[!--thispage--]/[!--pagenum--]&nbsp;每页[!--lencord--]&nbsp;总数[!--num--]&nbsp;&nbsp;&nbsp;&nbsp;[!--pagelink--]&nbsp;&nbsp;&nbsp;&nbsp;转到:[!--options--]',
+    'reuserpagenum'=>50,
+    'revotejsnum'=>100,
+    'readjsnum'=>100,
+    'qaddtran'=>1,
+    'qaddtransize'=>50,
+    'ebakthisdb'=>1,
+    'delnewsnum'=>300,
+    'markpos'=>5,
+    'markimg'=>'../data/mark/maskdef.gif',
+    'marktext'=>'',
+    'markfontsize'=>'5',
+    'markfontcolor'=>'',
+    'markfont'=>'../data/mark/cour.ttf',
+    'adminloginkey'=>1,
+    'php_outtime'=>0,
+    'listpagefun'=>'sys_ShowListPage',
+    'textpagefun'=>'sys_ShowTextPage',
+    'adfile'=>'thea',
+    'notsaveurl'=>'',
+    'rssnum'=>50,
+    'rsssub'=>300,
+    'savetxtf'=>',article.newstext,',
+    'dorepdlevelnum'=>300,
+    'listpagelistfun'=>'sys_ShowListMorePage',
+    'listpagelistnum'=>10,
+    'infolinknum'=>100,
+    'searchgroupid'=>0,
+    'opencopytext'=>0,
+    'reuserjsnum'=>100,
+    'reuserlistnum'=>8,
+    'opentitleurl'=>1,
+    'searchtempvar'=>1,
+    'showinfolevel'=>0,
+    'navfh'=>'>',
+    'spicwidth'=>105,
+    'spicheight'=>118,
+    'spickill'=>1,
+    'jpgquality'=>80,
+    'markpct'=>65,
+    'redoview'=>24,
+    'reggetfen'=>0,
+    'regbooktime'=>30,
+    'revotetime'=>30,
+    'fpath'=>2,
+    'filepath'=>'Y-m-d',
+    'nreclass'=>',',
+    'nreinfo'=>',',
+    'nrejs'=>',',
+    'nottobq'=>',',
+    'defspacestyleid'=>1,
+    'canposturl'=>'',
+    'openspace'=>0,
+    'defadminstyle'=>1,
+    'realltime'=>0,
+    'closeip'=>'',
+    'openip'=>'',
+    'hopenip'=>'',
+    'textpagelistnum'=>6,
+    'memberlistlevel'=>0,
+    'ebakcanlistdb'=>0,
+    'keytog'=>2,
+    'keytime'=>30,
+    'keyrnd'=>'TVs2EJxL8BPWsnV0mSPHK9hkB8h3IA',
+    'checkdorepstr'=>',0,0,0,0,',
+    'regkey_ok'=>0,
+    'opengetdown'=>0,
+    'gbkey_ok'=>0,
+    'fbkey_ok'=>0,
+    'newaddinfotime'=>0,
+    'classnavs'=>'<a href=\"/huandeng/\">首页幻灯</a>&nbsp;|&nbsp;<a href=\"/zhuanfang/\">扳手专访</a>&nbsp;|&nbsp;<a href=\"/news/\">新闻</a>&nbsp;|&nbsp;<a href=\"/ziliao/\">资料库</a>&nbsp;|&nbsp;<a href=\"/pinpai/\">品牌 - 无用</a>&nbsp;|&nbsp;<a href=\"/pinlei/\">品类 - 无用</a>',
+    'adminstyle'=>',1,2,',
+    'docnewsnum'=>300,
+    'openschall'=>1,
+    'schallfield'=>1,
+    'schallminlen'=>3,
+    'schallmaxlen'=>20,
+    'schallnum'=>50,
+    'schallpagenum'=>10,
+    'dtcanbq'=>1,
+    'dtcachetime'=>43200,
+    'repkeynum'=>0,
+    'regacttype'=>0,
+    'opengetpass'=>0,
+    'hlistinfonum'=>30,
+    'qlistinfonum'=>25,
+    'dtncanbq'=>1,
+    'dtncachetime'=>43200,
+    'readdinfotime'=>0,
+    'qeditinfotime'=>0,
+    'onclicktype'=>0,
+    'onclickfilesize'=>10,
+    'onclickfiletime'=>60,
+    'schalltime'=>1,
+    'defprinttempid'=>1,
+    'opentags'=>1,
+    'tagstempid'=>1,
+    'usetags'=>',1,2,3,4,5,6,7,8,',
+    'chtags'=>'',
+    'tagslistnum'=>25,
+    'closeqdt'=>0,
+    'settop'=>0,
+    'qlistinfomod'=>0,
+    'gb_num'=>20,
+    'member_num'=>20,
+    'space_num'=>25,
+    'infolday'=>0,
+    'filelday'=>0,
+    'dorepkey'=>0,
+    'dorepword'=>0,
+    'onclickrnd'=>'',
+    'indexpagedt'=>0,
+    'keybgcolor'=>'',
+    'keyfontcolor'=>'',
+    'keydistcolor'=>'',
+    'indexpageid'=>0,
+    'closeqdtmsg'=>'',
+    'openfileserver'=>0,
+    'fs_purl'=>'',
+    'closemods'=>'',
+    'fieldandtop'=>0,
+    'fieldandclosetb'=>'',
+    'filedatatbs'=>',1,',
+    'filedeftb'=>1,
+    'pldeftb'=>1,
+    'plurl'=>'/e/pl/',
+    'plkey_ok'=>0,
+    'plface'=>'||[~e.jy~]##1.gif||[~e.kq~]##2.gif||[~e.se~]##3.gif||[~e.sq~]##4.gif||[~e.lh~]##5.gif||[~e.ka~]##6.gif||[~e.hh~]##7.gif||[~e.ys~]##8.gif||[~e.ng~]##9.gif||[~e.ot~]##10.gif||',
+    'plf'=>'',
+    'pldatatbs'=>',1,',
+    'defpltempid'=>1,
+    'pl_num'=>12,
+    'plgroupid'=>0,
+    'closelisttemp'=>'',
+    'chclasscolor'=>'#99C4E3',
+    'timeclose'=>'',
+    'timeclosedo'=>'',
+    'ipaddinfonum'=>0,
+    'ipaddinfotime'=>0,
+    'rewriteinfo'=>'',
+    'rewriteclass'=>'',
+    'rewriteinfotype'=>'',
+    'rewritetags'=>'',
+    'rewritepl'=>'',
+    'memberconnectnum'=>0,
+    'closehmenu'=>'',
+    'indexaddpage'=>0,
+    'modmemberedittran'=>0,
+    'modinfoedittran'=>0,
+    'deftempid'=>0);
+//------------e_public
+
+//moreports
+$emoreport_r=array();
+//moreports
+
+
 //-------EmpireCMS.Public.Cache-------
 
 $emod_pubr=Array('linkfields'=>'|');
@@ -407,7 +612,7 @@ $emod_r[1]=Array('mid'=>1,
     'qeditdofunf'=>'||',
     'definfovoteid'=>0,
     'orderf'=>'',
-    'sonclass'=>'|2|3|10|28|11|12|13|14|15|16|29|',
+    'sonclass'=>'|',
     'tid'=>1,
     'tbname'=>'news');
 $emod_r[2]=Array('mid'=>2,