diff --git a/admin/appmarket/appupgrade.php b/admin/appmarket/appupgrade.php index abcd52a..01d9d6f 100644 --- a/admin/appmarket/appupgrade.php +++ b/admin/appmarket/appupgrade.php @@ -16,7 +16,7 @@ $op = isset($_GET['op']) ? $_GET['op'] : ''; //获取所有标签top50； //$tags = DB::fetch_all("SELECT * FROM %t WHERE hot>0 ORDER BY HOT DESC limit 50", array('app_tag'),'appid'); -$keyword = trim($_GET['keyword']); +$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : ''; $tagid = intval($_GET['tagid']); $group = intval($_GET['group']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); diff --git a/admin/appmarket/cloudappmarket.php b/admin/appmarket/cloudappmarket.php index 34f4459..cb1fb6d 100644 --- a/admin/appmarket/cloudappmarket.php +++ b/admin/appmarket/cloudappmarket.php @@ -18,7 +18,7 @@ $cloudurl = APP_CHECK_URL."index.php"; $url=APP_CHECK_URL."market/app/list";//$cloudurl."?mod=dzzmarket&op=index_ajax"; $type=empty($_GET['type'])?1:intval($_GET['type']); $page = empty($_GET['page'])?1:intval($_GET['page']); -$keyword=trim($_GET['keyword']); +$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : ''; $classid=intval($_GET['classid']); $post_data = array("siteuniqueid"=>$_G["setting"]["siteuniqueid"],"page"=>$page,"type"=>1 ); $json = curlcloudappmarket($url,$post_data); diff --git a/admin/appmarket/default.php b/admin/appmarket/default.php index c42fd74..61008ab 100644 --- a/admin/appmarket/default.php +++ b/admin/appmarket/default.php @@ -57,7 +57,7 @@ if ($depid && $org = C::t('organization') -> fetch($depid)) { } $position = intval($_GET['position']); -$keyword = trim($_GET['keyword']); +$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : ''; $page = empty($_GET['page']) ? 1 : intval($_GET['page']); $perpage = 20; diff --git a/admin/appmarket/index.php b/admin/appmarket/index.php index 7201540..5b0d141 100644 --- a/admin/appmarket/index.php +++ b/admin/appmarket/index.php @@ -28,7 +28,7 @@ if (submitcheck('appsubmit')) { //获取所有标签top50； $tags = DB::fetch_all("SELECT * FROM %t WHERE hot>0 ORDER BY HOT DESC limit 50", array('app_tag'),'tagid'); -$keyword = trim($_GET['keyword']); +$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : ''; $tagid = intval($_GET['tagid']); $group = intval($_GET['group']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); diff --git a/admin/appmarket/upgrade.php b/admin/appmarket/upgrade.php index f3db523..5cafb5d 100644 --- a/admin/appmarket/upgrade.php +++ b/admin/appmarket/upgrade.php @@ -14,18 +14,18 @@ if(!defined('IN_DZZ') || !defined('IN_ADMIN')) { //卸载程序； $applist_midnone=DB::fetch_all("select * from %t where mid=0 ",array('app_market')); -if( $applist_midnone ){ +if($applist_midnone){ $dzz_upgrade = new dzz_upgrade_app(); - foreach( $applist_midnone as $value){ + foreach($applist_midnone as $value){ $url=APP_CHECK_URL."market/app/getmid";//."index.php?mod=dzzmarket&op=index_ajax&operation=getmid"; $post_data = array( "version"=>$value['version'], "identifier"=>$value['identifier'], "app_path"=>$value["app_path"] ); - $json = $dzz_upgrade->curlcloudappmarket($url,$post_data); + $json = $dzz_upgrade->curlcloudappmarket($url,$post_data); $json = json_decode($json,true); - if( $json["status"]==1){ + if($json["status"]==1){ $mid = $json["mid"]; DB::update('app_market',array('mid'=>$mid),"appid=".$value["appid"]); } diff --git a/admin/appmarket/upgrade_app_ajax.php b/admin/appmarket/upgrade_app_ajax.php index a73f987..27c383a 100644 --- a/admin/appmarket/upgrade_app_ajax.php +++ b/admin/appmarket/upgrade_app_ajax.php @@ -549,7 +549,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ ); $re=C::t('app_market')->update( $appid,$map); - updatecache('setting'); + updatecache('setting'); $return["url"] = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=check_upgrade&appid='.$appinfo["appid"]; $return["percent"]=100; diff --git a/core/class/class_GifMerge.php b/core/class/class_GifMerge.php index 20c08d7..5575260 100644 --- a/core/class/class_GifMerge.php +++ b/core/class/class_GifMerge.php @@ -36,7 +36,7 @@ class GifMerge { var $global_out = array(); var $logical_screen_descriptor = array(); - function GifMerge($images, $t1, $t2, $t3, $loop, $dl, $xpos, $ypos, $model) { + function __construct($images, $t1, $t2, $t3, $loop, $dl, $xpos, $ypos, $model) { if($model) { $this->mod = $model; } diff --git a/core/class/class_xml.php b/core/class/class_xml.php index c4ce22a..ba42059 100644 --- a/core/class/class_xml.php +++ b/core/class/class_xml.php @@ -26,7 +26,7 @@ function attribute2arr($values,$data=array() ){ $return = attribute2arr($v["item"]); if($return) $data[$v['@attributes']["id"]]=$return ; } - if(count($v['@attributes'])>1){ + if (is_array($v['@attributes']) && count($v['@attributes']) > 1) { $data[$v['@attributes']["id"]]["_attributes"] = $v['@attributes']; unset($data[$v['@attributes']["id"]]["_attributes"]["id"]); } diff --git a/core/class/dzz/Hook.php b/core/class/dzz/Hook.php index d044e8a..2b8f1da 100644 --- a/core/class/dzz/Hook.php +++ b/core/class/dzz/Hook.php @@ -83,7 +83,7 @@ class Hook if(is_array($name)){ foreach($name as $val){ - $results[$key] = self::exec($val, $tag, $params, $extra,$break); + $results[$key] = self::exec($val,$break, $tag, $params, $extra); if (false === $results[$key] || $break == true) { break; @@ -97,7 +97,7 @@ class Hook }else{ - $results[$key] = self::exec($name, $tag, $params, $extra,$break); + $results[$key] = self::exec($name,$break, $tag, $params, $extra); if (false === $results[$key] || $break == true) { @@ -125,7 +125,8 @@ class Hook * @param mixed $extra 额外参数 * @return mixed */ - public static function exec($class, $tag = '', &$params = null,$extra = null,&$break) + + public static function exec($class, &$break, $tag = '', &$params = null, $extra = null) { if(strpos($class,'|') !== false){//判断是否规定了作用域，并判断作用域确定是否执行钩子 $rangArr = explode('|',$class); diff --git a/core/class/dzz/dzz_io.php b/core/class/dzz/dzz_io.php index 94b8ac6..4fc72ff 100644 --- a/core/class/dzz/dzz_io.php +++ b/core/class/dzz/dzz_io.php @@ -317,7 +317,9 @@ class dzz_io $relativePath=self::clean(urldecode($relativePath)); if($io=self::initIO($path)) { $return=$io->uploadStream($file,$name,$path,$relativePath,$content_range); - Hook::listen('createafter_addindex',$return['icoarr'][0]); + if (isset($return['icoarr']) && is_array($return['icoarr']) && count($return['icoarr']) > 0) { + Hook::listen('createafter_addindex', $return['icoarr'][0]); + } return $return; } else return false; diff --git a/core/class/dzz/route.php b/core/class/dzz/route.php index 5128be4..28d13e9 100644 --- a/core/class/dzz/route.php +++ b/core/class/dzz/route.php @@ -5,31 +5,27 @@ use \core as C; use \core\dzz\Hook as Hook; use \DB as DB; use \IO as IO; - class Route{ public static function dzzRoute(&$params,$extra=null,&$break) { - global $_G,$_config; $mod = !empty($params[MOULD]) ? $params[MOULD]:$_config['default_mod']; - $op = !empty($params[DIVIDE]) ? $params[DIVIDE]:$_config['default_op']; + define('MOD_PATH',CURSCRIPT.'/'.CURMODULE); + define('MOD_NAME',CURMODULE); + define('MOD_URL',BASESCRIPT.'?mod='.$mod); + define('OP_NAME',$op); if(empty($mod)){ - if($_G['uid']<1 && !defined('ALLOWGUEST') && $_G['setting']['loginset']['available']){ @header("Location: user.php?mod=login".($_GET['referer']?'&referer='.$_GET['referer']:'')); exit(); } - $return = require DZZ_ROOT.'./'.CURSCRIPT.'/'.$op.EXT; - }else{ - if(strpos(strtolower($mod),':')!==false){ - $patharr=explode(':',$mod); foreach($patharr as $path){ @@ -43,14 +39,11 @@ class Route{ //兼容老版 if(@!file_exists($modfile='./'.CURSCRIPT.'/'.CURSCRIPT.'_'.str_replace(':','/',$mod).EXT)){ - showmessage($modfile.lang('file_nonexistence',array('modfile'=>htmlspecialchars($modfile)))); } } - }else{ - if(!preg_match("/^\w+$/i",$mod) && $mod !== '') showmessage('undefined_action'); if(!preg_match("/^\w+$/i",$op)) showmessage('undefined_action'); @@ -63,15 +56,9 @@ class Route{ } } - } - //模块常量 - define('MOD_PATH',CURSCRIPT.'/'.CURMODULE); - define('MOD_NAME',CURMODULE); define('MOD_DIR',dirname($modfile)); - define('MOD_URL',BASESCRIPT.'?mod='.$mod); - define('OP_NAME',$op); // $break = true; Hook::listen('mod_run'); return DZZ_ROOT.$modfile; diff --git a/core/class/table/table_app_open.php b/core/class/table/table_app_open.php index afe9967..ce1c141 100644 --- a/core/class/table/table_app_open.php +++ b/core/class/table/table_app_open.php @@ -69,6 +69,7 @@ class table_app_open extends dzz_table } public function fetch_all_ext(){ + global $_G; $data = array(); if(($data = $this->fetch_cache('all')) === false) { $data = array(); @@ -77,6 +78,7 @@ class table_app_open extends dzz_table if($value['appid']){ if($app=C::t('app_market')->fetch_by_appid($value['appid'],false)){ if($app['available']<1) continue; + if(!$_G['uid'] && $app['group'] > 0) continue; if(!$value['icon']) $value['icon']=$app['appico']; if(!$value['name']) $value['name']=$app['appname']; if(!$value['url']) $value['url']=$app['appurl']; @@ -95,19 +97,17 @@ class table_app_open extends dzz_table } public function fetch_all_orderby_ext($uid,$ext_all=array()){ $data = array(); + $appids=array(); if($config = C::t('user_field')->fetch($uid)){ if($config['applist']){ $appids=explode(',',$config['applist']); - }else{ - $appids=array(); } } if(!$ext_all) $ext_all=self::fetch_all_ext(); - foreach($ext_all as $value){ - if($value['appid'] && !in_array($value['appid'],$appids)){ - continue; + foreach ($ext_all as $value) { + if ($uid == 0 || (!$value['appid'] || in_array($value['appid'], $appids))) { + $data[$value['ext']][] = $value['extid']; } - $data[$value['ext']][]=$value['extid']; } return $data; diff --git a/core/class/table/table_attachment.php b/core/class/table/table_attachment.php index 5cdc3af..aa0509a 100644 --- a/core/class/table/table_attachment.php +++ b/core/class/table/table_attachment.php @@ -119,11 +119,11 @@ class table_attachment extends dzz_table if($filter['aid']){ $where.=" and aid='{$filter['aid']}'"; } - $filter['sizelt']=intval($filter['sizelt']*1024*1024); + $filter['sizelt'] = (isset($filter['sizelt']) ? intval($filter['sizelt']) : 0) * 1024 * 1024; if($filter['sizelt']>0){ $where.=" and filesize>'{$filter[sizelt]}'"; } - $filter['sizegt']=intval($filter['sizegt']*1024*1024); + $filter['sizelt'] = (isset($filter['sizegt']) ? intval($filter['sizegt']) : 0) * 1024 * 1024; if($filter['sizegt']>0){ $where .= " and filesize < '{$filter['sizegt']}'"; } diff --git a/core/class/table/table_resources_event.php b/core/class/table/table_resources_event.php index 3acd60f..65341ed 100644 --- a/core/class/table/table_resources_event.php +++ b/core/class/table/table_resources_event.php @@ -76,6 +76,7 @@ class table_resources_event extends dzz_table $starttime = strtotime($time); $endtime = $starttime + 3600 * 24; $events = array(); + include_once libfile('function/use'); foreach (DB::fetch_all("select * from %t where gid = %d and dateline > %d and dateline < %d order by dateline desc", array($this->_table, $gid, $starttime, $endtime)) as $v) { $v['body_data'] = unserialize($v['body_data']); $v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']); @@ -108,6 +109,7 @@ class table_resources_event extends dzz_table return DB::result_first("select count(*) from %t where pfid = %d and rid = '' and `type`= %d", $params); } $events = array(); + include_once libfile('function/use'); foreach (DB::fetch_all("select * from %t where pfid = %d and rid = '' and `type`= %d order by dateline desc $limitsql", $params) as $v) { $v['body_data'] = unserialize($v['body_data']); $v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']); @@ -138,6 +140,7 @@ class table_resources_event extends dzz_table } $uid = array(); $events = array(); + include_once libfile('function/use'); foreach (DB::fetch_all("select * from %t where rid = %s and `type`= %d order by dateline desc $limitsql", $params) as $v) { $v['body_data'] = unserialize($v['body_data']); $v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']); @@ -182,6 +185,7 @@ class table_resources_event extends dzz_table $limitsql = $limit ? DB::limit($start, $limit) : ''; $events = array(); $uids = array(); + include_once libfile('function/use'); foreach (DB::fetch_all("select * from %t $wheresql order by dateline desc $limitsql", $params) as $v) { $v['body_data'] = unserialize($v['body_data']); $v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']); diff --git a/core/function/function_core.php b/core/function/function_core.php index 1972f08..a0e835f 100644 --- a/core/function/function_core.php +++ b/core/function/function_core.php @@ -330,8 +330,11 @@ function daddslashes($string, $force = 1) return $string; } -function authcode($string, $operation = 'DECODE', $key = '', $expiry = 0, $ckey_length = 4) +function authcode($string = '', $operation = 'DECODE', $key = '', $expiry = 0, $ckey_length = 4) { + if (!$string) { + return ''; + } //$ckey_length = 4; $key = md5($key != '' ? $key : getglobal('authkey')); $keya = md5(substr($key, 0, 16)); diff --git a/core/template/default/common/commer_header.htm b/core/template/default/common/commer_header.htm index 3f94825..dabd298 100644 --- a/core/template/default/common/commer_header.htm +++ b/core/template/default/common/commer_header.htm @@ -55,7 +55,7 @@ _notice.flashTitle=function(flag){ _notice.flashStep++; if (_notice.flashStep==3) {_notice.flashStep=1;} if (_notice.flashStep==1) {document.title="【您有新的通知】";} - if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";} + if (_notice.flashStep==2) {document.title="【$_G['setting']['sitename']】";} setTimeout(function(){_notice.flashTitle();},500); //循环 } \ No newline at end of file diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm index 1b47285..8250c63 100644 --- a/core/template/default/common/showmessage.htm +++ b/core/template/default/common/showmessage.htm @@ -29,13 +29,13 @@ - + diff --git a/core/template/lyear/common/copyright.htm b/core/template/lyear/common/copyright.htm index 3129910..49b0611 100644 --- a/core/template/lyear/common/copyright.htm +++ b/core/template/lyear/common/copyright.htm @@ -1,4 +1,4 @@ Copyright © 2012-{eval echo dgmdate(TIMESTAMP,'Y');} www.dzzoffice.com All Rights Reserved
Powered By DzzOffice V{eval echo CORE_VERSION} -
$_G[setting][sitebeian] +
$_G['setting']['sitebeian'] \ No newline at end of file diff --git a/core/template/lyear/common/header_common.htm b/core/template/lyear/common/header_common.htm index 287dbf0..92a94c2 100644 --- a/core/template/lyear/common/header_common.htm +++ b/core/template/lyear/common/header_common.htm @@ -4,7 +4,7 @@ - <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename] + <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename'] diff --git a/core/template/lyear/common/header_simple.htm b/core/template/lyear/common/header_simple.htm index 361888d..6cc6141 100644 --- a/core/template/lyear/common/header_simple.htm +++ b/core/template/lyear/common/header_simple.htm @@ -3,7 +3,7 @@ - <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename] + <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename'] @@ -22,10 +22,10 @@ - data-theme="$_G['cookie']['the_site_theme']" data-sidebarbg="$_G['cookie']['the_sidebar_bg']" data-headerbg="$_G['cookie']['the_header_bg']" data-logobg="$_G['cookie']['the_logo_bg']"> + data-theme="$_G['cookie']['the_site_theme']" style="$bodystyle">
\ No newline at end of file diff --git a/core/template/lyear/common/header_simple_end.htm b/core/template/lyear/common/header_simple_end.htm index e86661c..c3a974a 100644 --- a/core/template/lyear/common/header_simple_end.htm +++ b/core/template/lyear/common/header_simple_end.htm @@ -1,5 +1,5 @@ - +
-
-