iSharkFly-Open
/
DiscuzX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.oschina.net:ComsenzDiscuz/DiscuzX

This commit is contained in:
Comsenz 2017-07-21 09:31:23 +08:00
parent 16c31201d8 39b2d311a7
commit 79d955f669
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upload/install/index.php
View File

@ -343,7 +343,7 @@ if($method == 'show_license') {
$uid = DZUCFULL ? 1 : $adminuser['uid']; $uid = DZUCFULL ? 1 : $adminuser['uid'];
$authkey = substr(md5($_SERVER['SERVER_ADDR'].$_SERVER['HTTP_USER_AGENT'].$dbhost.$dbuser.$dbpw.$dbname.$username.$password.$pconnect.substr($timestamp, 0, 6)), 8, 6).random(10); $authkey = md5($_SERVER['SERVER_ADDR'].$_SERVER['HTTP_USER_AGENT'].$dbhost.$dbuser.$dbpw.$dbname.$username.$password.$pconnect.substr($timestamp, 0, 8)).random(18);
$_config['db'][1]['dbhost'] = $dbhost; $_config['db'][1]['dbhost'] = $dbhost;
$_config['db'][1]['dbname'] = $dbname; $_config['db'][1]['dbname'] = $dbname;
$_config['db'][1]['dbpw'] = $dbpw; $_config['db'][1]['dbpw'] = $dbpw;

2
upload/source/class/table/table_common_task.php
View File

@ -70,7 +70,7 @@ class table_common_task extends discuz_table
case 'canapply': case 'canapply':
case 'new': case 'new':
default: default:
$status = "'".TIMESTAMP."' > starttime AND (mt.taskid IS NULL OR (ABS(mt.status)='1' AND t.period>0))"; $status = "'".TIMESTAMP."' > starttime AND (endtime=0 OR endtime>'".TIMESTAMP."') AND (mt.taskid IS NULL OR (ABS(mt.status)='1' AND t.period>0))";
break; break;
} }
return DB::fetch_all("SELECT t.*, mt.csc, mt.dateline FROM %t t return DB::fetch_all("SELECT t.*, mt.csc, mt.dateline FROM %t t

4
upload/source/function/function_discuzcode.php
View File

@ -247,10 +247,6 @@ function discuzcode($message, $smileyoff = false, $bbcodeoff = false, $htmlon =
if($parsetype != 1 && strpos($msglower, '[swf]') !== FALSE) { if($parsetype != 1 && strpos($msglower, '[swf]') !== FALSE) {
$message = preg_replace_callback("/\[swf\]\s*([^\[\<\r\n]+?)\s*\[\/swf\]/is", 'discuzcode_callback_bbcodeurl_1', $message); $message = preg_replace_callback("/\[swf\]\s*([^\[\<\r\n]+?)\s*\[\/swf\]/is", 'discuzcode_callback_bbcodeurl_1', $message);
} }
if(defined('IN_MOBILE') && !defined('TPL_DEFAULT') && !defined('IN_MOBILE_API')) {
$allowimgcode = false;
}
$attrsrc = !IS_ROBOT && $lazyload ? 'file' : 'src'; $attrsrc = !IS_ROBOT && $lazyload ? 'file' : 'src';
if(strpos($msglower, '[/img]') !== FALSE) { if(strpos($msglower, '[/img]') !== FALSE) {
$message = preg_replace_callback("/\[img\]\s*([^\[\<\r\n]+?)\s*\[\/img\]/is", create_function('$matches', 'return '.intval($allowimgcode).' ? parseimg(0, 0, $matches[1], '.intval($lazyload).', '.intval($pid).', \'onmouseover="img_onmouseoverfunc(this)" \'.('.intval($lazyload).' ? \'lazyloadthumb="1"\' : \'onload="thumbImg(this)"\')) : ('.intval($allowbbcode).' ? (!defined(\'IN_MOBILE\') ? bbcodeurl($matches[1], \'<a href="{url}" target="_blank">{url}</a>\') : bbcodeurl($matches[1], \'\')) : bbcodeurl($matches[1], \'{url}\'));'), $message); $message = preg_replace_callback("/\[img\]\s*([^\[\<\r\n]+?)\s*\[\/img\]/is", create_function('$matches', 'return '.intval($allowimgcode).' ? parseimg(0, 0, $matches[1], '.intval($lazyload).', '.intval($pid).', \'onmouseover="img_onmouseoverfunc(this)" \'.('.intval($lazyload).' ? \'lazyloadthumb="1"\' : \'onload="thumbImg(this)"\')) : ('.intval($allowbbcode).' ? (!defined(\'IN_MOBILE\') ? bbcodeurl($matches[1], \'<a href="{url}" target="_blank">{url}</a>\') : bbcodeurl($matches[1], \'\')) : bbcodeurl($matches[1], \'{url}\'));'), $message);

2
upload/static/image/mobile/style.css
View File

@ -147,7 +147,7 @@
.plc .pi .authi li em{ float:right; font-style: normal; } .plc .pi .authi li em{ float:right; font-style: normal; }
.plc .pi .message{ font-size:15px; } .plc .pi .message{ font-size:15px; }
.plc .pi .message .jammer{ font-size:10px; color:#F0F0F0; } .plc .pi .message .jammer{ font-size:10px; color:#F0F0F0; }
.plc .pi .message img,.plc .pi .img_one img { margin:0px 4px 0px 0; max-width:140px; max-height:140px; } .plc .pi .message img,.plc .pi .img_one img { margin:0px 4px 0px 0; max-width:100%;}
.plc .pi .message .quote{ padding:10px 10px 7px 11px; margin:5px 0; border:1px dashed #D7D7D7; font-size:12px; } .plc .pi .message .quote{ padding:10px 10px 7px 11px; margin:5px 0; border:1px dashed #D7D7D7; font-size:12px; }
.plc .pi .img_list { margin:4px auto; } .plc .pi .img_list { margin:4px auto; }
.plc .pi .img_list li { float:left; width:83px; height:83px; margin:0 4px 4px; text-align:center;vertical-align: middle; line-height:83px; } .plc .pi .img_list li { float:left; width:83px; height:83px; margin:0 4px 4px; text-align:center;vertical-align: middle; line-height:83px; }