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

修复 安装时的curl判断 

修复 补充修复XSS漏洞
优化 MariaDB的支持
This commit is contained in:
康盛Discuz! 2016-12-20 12:12:02 +08:00
parent f2a9bf936a
commit c82548c0d2
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
upload/install/include/install_function.php
View File

@ -4,7 +4,7 @@
* [Discuz!] (C)2001-2099 Comsenz Inc.
* This is NOT a freeware, use is subject to license terms
*
* $Id: install_function.php 36311 2016-12-19 01:47:34Z nemohou $
* $Id: install_function.php 36313 2016-12-19 07:06:44Z nemohou $
*/
if(!defined('IN_COMSENZ')) {
@ -152,8 +152,12 @@ function env_check(&$env_items) {
$opcache_data = function_exists('opcache_get_configuration') ? opcache_get_configuration() : array();
$env_items[$key]['current'] = !empty($opcache_data['directives']['opcache.enable']) ? $lang['enable'] : $lang['disable'];
} elseif($key == 'curl') {
$v = curl_version();
$env_items[$key]['current'] = function_exists('curl_init') && function_exists('curl_version') ? $lang['enable'].' '.$v['version'] : $lang['disable'];
if(function_exists('curl_init') && function_exists('curl_version')){
$v = curl_version();
$env_items[$key]['current'] = $lang['enable'].' '.$v['version'];
}else{
$env_items[$key]['current'] = $lang['disable'];
}
}
$env_items[$key]['status'] = 1;

4
upload/source/admincp/discuzfiles.md5
View File

@ -376,7 +376,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/class/forum/index.htm
6b28f204ff769711574ada68e6c7a901 *source/class/helper/helper_access.php
79feb45e4626dbba96e19ea147fff3e2 *source/class/helper/helper_antitheft.php
59220a31da954b7d2227f336dbb6f0c3 *source/class/helper/helper_attach.php
7022fd0d4c037305b08aa3702a6add1e *source/class/helper/helper_dbtool.php
c4737977ff68df3313785461f86f9921 *source/class/helper/helper_dbtool.php
7c04f9ac826ce41bebc85493a079d5a5 *source/class/helper/helper_form.php
f44c81f0cf86f12e234da0e7f03d11f0 *source/class/helper/helper_json.php
cd6ed5c1af415245d93e3235c8ede908 *source/class/helper/helper_log.php
@ -1205,7 +1205,7 @@ c4cc92f6de3bddcbe452039bba167d4f *source/module/misc/misc_diyhelp.php
44ee478ce8ef8877022f03a236e0b8aa *source/module/misc/misc_error.php
aed09ee91f0152cf394e8fe7eb83d007 *source/module/misc/misc_faq.php
0c2a7a825561f1cbb9d74112086bc430 *source/module/misc/misc_getatuser.php
2c8398a01bce554423a72d1ed9408e6a *source/module/misc/misc_imgcropper.php
670249a9c4264680aeaef53d39d9da8e *source/module/misc/misc_imgcropper.php
0131e5eb18245cf4191f92b940a0ea45 *source/module/misc/misc_initsys.php
c41c71f883fd0e79e84bd620edc6e747 *source/module/misc/misc_invite.php
9f78eea5aef9b4d27aa5159edba88316 *source/module/misc/misc_manyou.php

5
upload/source/class/helper/helper_dbtool.php
View File

@ -4,7 +4,7 @@
* [Discuz!] (C)2001-2099 Comsenz Inc.
* This is NOT a freeware, use is subject to license terms
*
* $Id: helper_dbtool.php 31034 2012-07-11 04:03:30Z zhangjie $
* $Id: helper_dbtool.php 36319 2016-12-20 02:03:23Z nemohou $
*/
if (!defined('IN_DISCUZ')) {
exit('Access Denied');
@ -13,7 +13,8 @@ if (!defined('IN_DISCUZ')) {
class helper_dbtool {
public static function dbversion() {
return DB::result_first("SELECT VERSION()");
$db = & DB::object();
return $db->version();
}
public static function dbsize() {

8
upload/source/module/misc/misc_imgcropper.php
View File

@ -3,7 +3,7 @@
* [Discuz!] (C)2001-2099 Comsenz Inc.
* This is NOT a freeware, use is subject to license terms
*
* $Id: misc_imgcropper.php 36267 2016-11-11 09:03:24Z nemohou $
* $Id: misc_imgcropper.php 36314 2016-12-19 08:02:23Z nemohou $
*/
if(!defined('IN_DISCUZ')) {
@ -14,11 +14,13 @@ $_GET['img'] = htmlspecialchars($_GET['img']);
$_GET['bid'] = intval($_GET['bid']);
$_GET['picflag'] = intval($_GET['picflag']);
$_GET['ictype'] = !empty($_GET['ictype']) ? 'block' : '';
$_GET['width'] = intval($_GET['width']);
$_GET['height'] = intval($_GET['height']);
if(!submitcheck('imgcroppersubmit')) {
if($_GET['op'] == 'loadcropper') {
$cboxwidth = $_GET['width'] > 50 ? intval($_GET['width']) : 300;
$cboxheight = $_GET['height'] > 50 ? intval($_GET['height']) : 300;
$cboxwidth = $_GET['width'] > 50 ? $_GET['width'] : 300;
$cboxheight = $_GET['height'] > 50 ? $_GET['height'] : 300;
$cbgboxwidth = $cboxwidth + 300;
$cbgboxheight = $cboxheight + 300;