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

同步 细节

This commit is contained in:
Comsenz 2017-08-01 10:41:16 +08:00
parent ca464ed59a
commit d7ec4030d5
9 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upload/source/class/class_credit.php
View File

@ -235,7 +235,7 @@ class credit {
} }
} }
function fequencycheck($uids) { function frequencycheck($uids) {
global $_G; global $_G;
if(empty($_G['config']['security']['creditsafe']['second']) || empty($_G['config']['security']['creditsafe']['times'])) { if(empty($_G['config']['security']['creditsafe']['second']) || empty($_G['config']['security']['creditsafe']['times'])) {
return true; return true;
@ -245,7 +245,7 @@ class credit {
$v = intval(memory('get', $key)); $v = intval(memory('get', $key));
memory('set', $key, ++$v, $_G['config']['security']['creditsafe']['second']); memory('set', $key, ++$v, $_G['config']['security']['creditsafe']['second']);
if($v > $_G['config']['security']['creditsafe']['times']) { if($v > $_G['config']['security']['creditsafe']['times']) {
system_error('credit fequency limit', true); system_error('credit frequency limit', true);
return false; return false;
} }
} }
@ -257,7 +257,7 @@ class credit {
if(!$uids) $uids = intval($_G['uid']); if(!$uids) $uids = intval($_G['uid']);
$uids = is_array($uids) ? $uids : array($uids); $uids = is_array($uids) ? $uids : array($uids);
$this->fequencycheck($uids); $this->frequencycheck($uids);
if($uids && ($creditarr || $this->extrasql)) { if($uids && ($creditarr || $this->extrasql)) {
if($this->extrasql) $creditarr = array_merge($creditarr, $this->extrasql); if($this->extrasql) $creditarr = array_merge($creditarr, $this->extrasql);
$sql = array(); $sql = array();

2
upload/source/discuz_version.php
View File

@ -13,7 +13,7 @@ if(!defined('IN_DISCUZ')) {
if(!defined('DISCUZ_VERSION')) { if(!defined('DISCUZ_VERSION')) {
define('DISCUZ_VERSION', 'X3.4'); define('DISCUZ_VERSION', 'X3.4');
define('DISCUZ_RELEASE', '20170701'); define('DISCUZ_RELEASE', '20170801');
define('DISCUZ_FIXBUG', '34000000'); define('DISCUZ_FIXBUG', '34000000');
} }

1
upload/source/include/spacecp/spacecp_feed.php
View File

@ -66,6 +66,7 @@ if($_GET['op'] == 'delete') {
} }
showmessage('do_success', dreferer(), array('feedid' => $feedid), array('showdialog'=>1, 'showmsg' => true, 'closetime' => true)); showmessage('do_success', dreferer(), array('feedid' => $feedid), array('showdialog'=>1, 'showmsg' => true, 'closetime' => true));
} }
} elseif($_GET['op'] == 'getapp') {
} elseif($_GET['op'] == 'getcomment') { } elseif($_GET['op'] == 'getcomment') {

2
upload/source/include/topicadmin/topicadmin_stickreply.php
View File

@ -23,7 +23,7 @@ if(empty($topiclist)) {
showmessage('admin_nopermission', NULL); showmessage('admin_nopermission', NULL);
} }
$sticktopiclist = $posts = array(); $sticktopiclist = $posts = array();
foreach($topiclist as $pid) { foreach($topiclist as $pid) {
$post = C::t('forum_post')->fetch('tid:'.$_G['tid'], $pid, false); $post = C::t('forum_post')->fetch('tid:'.$_G['tid'], $pid, false);
$sticktopiclist[$pid] = $post['position']; $sticktopiclist[$pid] = $post['position'];
} }

2
upload/source/plugin/mobile/discuz_plugin_mobile.xml
View File

@ -39,7 +39,7 @@
</item> </item>
</item> </item>
</item> </item>
<item id="version"><![CDATA[X2.5,X3,X3.1,X3.2]]></item> <item id="version"><![CDATA[X2.5,X3,X3.1,X3.2,X3.3,X3.4]]></item>
<item id="language"> <item id="language">
<item id="scriptlang"> <item id="scriptlang">
<item id="mobile_tip_ios"><![CDATA[<a href="http://www.discuz.net/mobile.php?platform=ios">用掌上论坛访问本站,拥有更好阅读体验</a>]]></item> <item id="mobile_tip_ios"><![CDATA[<a href="http://www.discuz.net/mobile.php?platform=ios">用掌上论坛访问本站,拥有更好阅读体验</a>]]></item>

2
upload/source/plugin/myrepeats/discuz_plugin_myrepeats.xml
View File

@ -39,7 +39,7 @@
</item> </item>
</item> </item>
</item> </item>
<item id="version"><![CDATA[X3.2]]></item> <item id="version"><![CDATA[X3.2,X3.3,X3.4]]></item>
<item id="var"> <item id="var">
<item id="0"> <item id="0">
<item id="displayorder"><![CDATA[0]]></item> <item id="displayorder"><![CDATA[0]]></item>

2
upload/source/plugin/qqconnect/discuz_plugin_qqconnect.xml
View File

@ -67,7 +67,7 @@
</item> </item>
</item> </item>
</item> </item>
<item id="version"><![CDATA[X3.2,X3.3]]></item> <item id="version"><![CDATA[X3.2,X3.3,X3.4]]></item>
<item id="installfile"><![CDATA[install.php]]></item> <item id="installfile"><![CDATA[install.php]]></item>
<item id="upgradefile"><![CDATA[upgrade.php]]></item> <item id="upgradefile"><![CDATA[upgrade.php]]></item>
<item id="language"> <item id="language">

2
upload/source/plugin/wechat/discuz_plugin_wechat.xml
View File

@ -184,7 +184,7 @@
</item> </item>
</item> </item>
</item> </item>
<item id="version"><![CDATA[X2.5,X3,X3.1,X3.2]]></item> <item id="version"><![CDATA[X2.5,X3,X3.1,X3.2,X3.3,X3.4]]></item>
<item id="language"> <item id="language">
<item id="scriptlang"> <item id="scriptlang">
<item id="wechat_undefined"><![CDATA[此链接已过期，请重新在微信中生成此链接]]></item> <item id="wechat_undefined"><![CDATA[此链接已过期，请重新在微信中生成此链接]]></item>

2
upload/template/default/discuz_style_default.xml
View File

@ -54,6 +54,6 @@
<item id="contentseparate"><![CDATA[#C2D5E3]]></item> <item id="contentseparate"><![CDATA[#C2D5E3]]></item>
<item id="inputborder"><![CDATA[#E0E0E0]]></item> <item id="inputborder"><![CDATA[#E0E0E0]]></item>
</item> </item>
<item id="version"><![CDATA[X3.1]]></item> <item id="version"><![CDATA[X3.1,X3,2,X3.3,X3.4]]></item>
</item> </item>
</root> </root>