diff --git a/upload/source/class/class_credit.php b/upload/source/class/class_credit.php index 1941b26636032f4a3255aa91a07e0ed3f1ec0184..ebc7852d52a138911c07614fc081933eaaf8ed35 100644 --- a/upload/source/class/class_credit.php +++ b/upload/source/class/class_credit.php @@ -225,7 +225,7 @@ class credit { if(isset($_G['setting']['extcredits'][$i])) { $creditarr['extcredits'.$i] = intval($rule['extcredits'.$i]) * $this->coef; if(defined('IN_MOBILE') && $creditarr['extcredits'.$i] > 0) { - $creditarr['extcredits'.$i] += $_G['setting']['creditspolicymobile']; + $creditarr['extcredits'.$i] += (int)$_G['setting']['creditspolicymobile']; } $updatecredit = true; } diff --git a/upload/source/class/class_template.php b/upload/source/class/class_template.php index d1fd45ebf0cd07e04a0cf456c300bd45ac6a5b15..abc1b4abb82513ed6ae0219ce11c113a62ff22b1 100644 --- a/upload/source/class/class_template.php +++ b/upload/source/class/class_template.php @@ -28,10 +28,11 @@ class template { $this->file = $file; if($fp = @fopen(DISCUZ_ROOT.$tplfile, 'r')) { - $template = @fread($fp, filesize(DISCUZ_ROOT.$tplfile)); + $template = filesize(DISCUZ_ROOT.$tplfile) ? fread($fp, filesize(DISCUZ_ROOT.$tplfile)) : ''; fclose($fp); } elseif($fp = @fopen($filename = substr(DISCUZ_ROOT.$tplfile, 0, -(strlen($this->filetype) + 1)).'.php', 'r')) { - $template = $this->getphptemplate(@fread($fp, filesize($filename))); + $template = filesize($filename) ? fread($fp, filesize($filename)) : ''; + $template = $this->getphptemplate($template); fclose($fp); } else { $tpl = $tpldir.'/'.$file.'.'.$this->filetype; diff --git a/upload/source/function/cache/cache_setting.php b/upload/source/function/cache/cache_setting.php index 025efcd71f3762ca8ee3671dd4767abc6aa62a12..fa09909eec49487fbe83211dad3e89897e20bdfe 100644 --- a/upload/source/function/cache/cache_setting.php +++ b/upload/source/function/cache/cache_setting.php @@ -1123,10 +1123,10 @@ function writetojscache() { '', )); while(($entry = readdir($dh)) !== false) { - if(fileext($entry) == 'js') { + if(fileext($entry) == 'js' && filesize($dir.$entry)) { $jsfile = $dir.$entry; $fp = fopen($jsfile, 'r'); - $jsdata = @fread($fp, filesize($jsfile)); + $jsdata = fread($fp, filesize($jsfile)); fclose($fp); $jsdata = preg_replace($remove[0], $remove[1], $jsdata); if(file_put_contents(DISCUZ_ROOT.'./data/cache/'.$entry, $jsdata, LOCK_EX) === false) { diff --git a/upload/source/function/function_upload.php b/upload/source/function/function_upload.php index e6ea37d17701ba7f3a22d637962df9b87b6a19f1..1485ef48b38e0c34e60741c4c98d3c2ed89bc0dc 100644 --- a/upload/source/function/function_upload.php +++ b/upload/source/function/function_upload.php @@ -86,7 +86,7 @@ function getuploadconfig($uid=0, $fid=0, $limit=true) { if($limit) { if($_G['group']['maxattachnum']) { $todayattachs = getuserprofile('todayattachs'); - $config['maxattachnum'] = $_G['group']['maxattachnum'] - $todayattachs; + $config['maxattachnum'] = (int)$_G['group']['maxattachnum'] - (int)$todayattachs; $config['maxattachnum'] = $config['maxattachnum'] > 0 ? $config['maxattachnum'] : -1; $config['limit'] = $config['maxattachnum'] > 0 ? $config['maxattachnum'] : 0; } diff --git a/upload/source/module/forum/forum_guide.php b/upload/source/module/forum/forum_guide.php index e61dda0d600345c11141763340237513370928a9..cb5d6d04d257a604f046e042653c8e9fbf440f93 100644 --- a/upload/source/module/forum/forum_guide.php +++ b/upload/source/module/forum/forum_guide.php @@ -180,6 +180,7 @@ function get_guide_list($view, $start = 0, $num = 50, $again = 0) { $updatecache = true; } $query = C::t('forum_thread')->fetch_all_for_guide($view, $limittid, $tids, $_G['setting']['heatthread']['guidelimit'], $dateline); + $list = array(); $n = 0; foreach($query as $thread) { if(empty($tids) && ($thread['isgroup'] || !in_array($thread['fid'], $fids))) { diff --git a/upload/source/module/forum/forum_viewthread.php b/upload/source/module/forum/forum_viewthread.php index fc1618ed413a9d03c14abeb0b6ed68b5691be80a..e614bd425bfbb6cbf26b77fccc1ce4c82e245f4e 100644 --- a/upload/source/module/forum/forum_viewthread.php +++ b/upload/source/module/forum/forum_viewthread.php @@ -543,7 +543,7 @@ if($maxposition) { $postarr[$post['position']] = $post; $lastposition = $post['position']; } - $realpost = count($postarr); + $realpost = is_array($postarr) ? count($postarr) : 0; if($realpost != $_G['ppp'] || $have_badpost) { $k = 0; for($i = $start; $i < $end; $i ++) { diff --git a/upload/source/module/portal/portal_attachment.php b/upload/source/module/portal/portal_attachment.php index 6b2afe9dc5bb3ce2800475de586e87cf4bd6ac57..e314ff9dc0dd017168a8844f1e03273470e1eb8b 100644 --- a/upload/source/module/portal/portal_attachment.php +++ b/upload/source/module/portal/portal_attachment.php @@ -115,8 +115,8 @@ function getlocalfile($filename, $readmod = 2, $range = 0) { @fseek($fp, $range); if(function_exists('fpassthru') && ($readmod == 3 || $readmod == 4)) { @fpassthru($fp); - } else { - echo @fread($fp, filesize($filename)); + } else if(filesize($filename)) { + echo fread($fp, filesize($filename)); } } @fclose($fp); diff --git a/upload/template/default/forum/activity_applist_more.htm b/upload/template/default/forum/activity_applist_more.htm index 7a105bc13f6d71c2b289d795c7f3d7f2ad458e05..9a9a07b82f448e4bbe22c0cc43058b96c1bf9863 100644 --- a/upload/template/default/forum/activity_applist_more.htm +++ b/upload/template/default/forum/activity_applist_more.htm @@ -13,7 +13,7 @@ - + $apply[username]

$apply[message]

diff --git a/upload/template/default/forum/modcp_member.htm b/upload/template/default/forum/modcp_member.htm index 927a66dc3190c74705bcdc5afbcf55d3e4e2e8fc..2044c6cbe7ca3c70394b013acdaed9580b2c2542 100644 --- a/upload/template/default/forum/modcp_member.htm +++ b/upload/template/default/forum/modcp_member.htm @@ -47,7 +47,7 @@ - +

$member[username]

UID: $member[uid]

@@ -84,7 +84,7 @@
- + @@ -234,7 +234,7 @@ diff --git a/upload/template/default/group/group_manage.htm b/upload/template/default/group/group_manage.htm index 07dba674b8b02c019655710038cbacb618baf89f..18f7fafb5f2ee13fd2e26e447aaa4c9588295cdc 100644 --- a/upload/template/default/group/group_manage.htm +++ b/upload/template/default/group/group_manage.htm @@ -146,7 +146,7 @@
-
+
$user[username] ($user['joindateline'])
 
@@ -192,7 +192,7 @@ - +

$user[username]

@@ -217,7 +217,7 @@ - +

$user[username]

@@ -229,7 +229,7 @@
  • - +

    $user[username]

  • @@ -371,7 +371,7 @@
  • - +

    $user[username]

    diff --git a/upload/template/default/group/group_memberlist.htm b/upload/template/default/group/group_memberlist.htm index 937d317571a7bb75871cf3deea5b7b7b23784176..cc9741fbc37b29518e410fd74c5c3565831a8015 100644 --- a/upload/template/default/group/group_memberlist.htm +++ b/upload/template/default/group/group_memberlist.htm @@ -17,7 +17,7 @@ - +

    $user[username]

  • @@ -41,7 +41,7 @@ - +

    $user[username]

    @@ -52,7 +52,7 @@
    • - +

      $user[username]

    • diff --git a/upload/template/default/group/group_right.htm b/upload/template/default/group/group_right.htm index b71d1d4a64a325b054386cebb9be3b7491e79179..6a543e85d04e2274ba6a9b9e594632eb05c95199 100644 --- a/upload/template/default/group/group_right.htm +++ b/upload/template/default/group/group_right.htm @@ -30,7 +30,7 @@ - +

      $user[username] @@ -52,7 +52,7 @@ - +

      $user[username] diff --git a/upload/template/default/touch/group/group_manage.htm b/upload/template/default/touch/group/group_manage.htm index 1cd51b321d9c028b1cb186f234c0e740e52351e0..84677f52e9c9abcce93e0cc1a6a7952da03d7d1e 100644 --- a/upload/template/default/touch/group/group_manage.htm +++ b/upload/template/default/touch/group/group_manage.htm @@ -155,7 +155,7 @@

      • - +

        $user[username]

        diff --git a/upload/template/default/touch/ranklist/blog.htm b/upload/template/default/touch/ranklist/blog.htm index 0011f24b49a7e5abe35c92bb21204d4703e9e0cd..92095df5eeaa1a7179701cccb8cb2aca5e3fb31f 100644 --- a/upload/template/default/touch/ranklist/blog.htm +++ b/upload/template/default/touch/ranklist/blog.htm @@ -43,7 +43,7 @@
        $blog['rank']
        - +
        diff --git a/upload/uc_client/model/cache.php b/upload/uc_client/model/cache.php index bbb9cfa7394c99000b900caac4d2ba2827cba28f..8eb7754dbddfb2b4854d875e31c15cdad6808f4a 100644 --- a/upload/uc_client/model/cache.php +++ b/upload/uc_client/model/cache.php @@ -75,7 +75,9 @@ class cachemodel { $apps2 = array(); if(is_array($apps)) { foreach($apps as $v) { - $v['extra'] = unserialize($v['extra']); + if(!empty($v['extra'])) { + $v['extra'] = is_array($v['extra']) ? $v['extra'] : unserialize($v['extra']); + } $apps2[$v['appid']] = $v; } }

$member[username]

UID: $member[uid]

diff --git a/upload/template/default/forum/viewthread_activity.htm b/upload/template/default/forum/viewthread_activity.htm index 98f0a85cc4bd382705fc6eaec91b90a248cdbf85..e0389edeb866fc25cc7d26f3b1ec50fbd23c7dab 100644 --- a/upload/template/default/forum/viewthread_activity.htm +++ b/upload/template/default/forum/viewthread_activity.htm @@ -197,7 +197,7 @@
- + $apply[username]

$apply[message]

- + $apply[username] $apply[message]