From e417b116568159cb552f83b270be98170902864a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Sat, 9 Sep 2023 20:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3v1.86=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=9C=A8=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/appmarket/cloudappmarket.php | 2 +- admin/appmarket/cp.php | 14 +- admin/appmarket/edit.php | 3 - admin/appmarket/images/market.css | 18 +- admin/appmarket/install_app_ajax.php | 1 - admin/appmarket/list.php | 2 +- admin/appmarket/template/appdefault.htm | 4 +- admin/appmarket/template/cloudappmarket.htm | 32 +- admin/appmarket/template/cross.htm | 2 +- admin/appmarket/template/extopen.htm | 8 +- admin/appmarket/template/index.htm | 22 +- .../template/list_list_available.htm | 2 +- .../template/list_list_notinstall.htm | 2 +- .../appmarket/template/list_list_upgrade.htm | 2 +- admin/appmarket/template/upgrade.htm | 65 +- admin/appmarket/upgrade_app_ajax.php | 47 +- admin/cloud/edit.php | 2 +- admin/cloud/routeredit.php | 2 +- admin/cloud/template/cloud.htm | 2 +- admin/cloud/template/edit.htm | 4 +- admin/cloud/template/router.htm | 4 +- admin/cloud/template/space.htm | 4 +- admin/cloud/template/spaceadd.htm | 10 +- admin/language/zh-cn/lang.php | 2 +- admin/login/login.php | 2 +- admin/member/profileset.php | 4 +- admin/member/template/profileset.htm | 10 +- admin/member/template/verify.htm | 2 +- admin/member/template/verifyset.htm | 2 +- admin/member/verify.php | 6 +- admin/member/verifyset.php | 2 +- admin/setting/index.php | 34 +- admin/setting/smiley.php | 8 +- admin/setting/template/ajax.htm | 2 +- admin/setting/template/main.htm | 30 +- admin/setting/template/perm_group.htm | 2 +- admin/setting/template/smiley.htm | 4 +- admin/setting/template/smileyedit.htm | 2 +- admin/setting/template/wxsyn.htm | 8 +- admin/system/systemupgrade.php | 12 +- admin/system/template/cron.htm | 2 +- admin/system/template/database.htm | 6 +- admin/system/template/upgrade.htm | 6 +- admin/systemlog/template/admin.htm | 2 +- avatar.php | 7 +- core/class/dzz/Hook.php | 2 - core/class/dzz/apprun.php | 2 +- core/class/dzz/config.php | 2 +- core/class/dzz/dzz_app.php | 1 + core/class/dzz/dzz_error.php | 4 +- core/class/dzz/dzz_session.php | 19 +- core/class/dzz/dzz_session_close.php | 16 +- core/class/table/table_app_market.php | 9 +- core/class/table/table_session.php | 23 +- core/core_version.php | 6 +- core/template/default/common/adminlogin.htm | 24 +- core/template/default/common/beijing.htm | 2 +- .../template/default/common/footer_simple.htm | 2 +- .../template/default/common/header_common.htm | 3 +- .../template/default/common/header_simple.htm | 2 +- .../default/common/header_simple_start.htm | 2 +- core/template/default/common/safechk.htm | 8 +- dzz/DPlayer/dzz_app_DPlayer.xml | 4 +- dzz/comment/dzz_app_comment.xml | 2 - dzz/dzzvote/dzz_app_dzzvote.xml | 2 - dzz/dzzvote/template/vote_ajax.htm | 2 +- dzz/orguser/template/adduser.htm | 10 +- dzz/orguser/template/detail_org.htm | 2 +- dzz/orguser/template/edituser.htm | 10 +- dzz/orguser/template/import_list.htm | 4 +- dzz/share/template/share.htm | 2 +- dzz/shares/template/password.htm | 2 +- dzz/system/css/select-file.css | 13 +- dzz/system/template/filelist.htm | 6 +- dzz/system/template/fileselection/ajax.htm | 2 +- dzz/system/template/fileselection/index.htm | 12 +- dzz/system/template/notification.htm | 4 - dzz/system/template/orgtree.htm | 7 +- dzz/system/template/positionlist.htm | 19 +- dzz/system/template/selorguser.htm | 11 +- dzz/system/template/selposition.htm | 7 +- dzz/system/ueditor/ueditor.all.js | 2 +- install/data/install.sql | 5 +- install/index.php | 1 - install/update.php | 6 - misc/upgrade.php | 14 +- static/bootstrap/css/bootstrap.min.css | 32 +- static/css/animate.min.css | 226 ++- static/css/app_manage.css | 45 +- static/css/common.css | 9 +- static/css/style.min.css | 3 +- static/image/common/addUser.png | Bin 0 -> 596 bytes static/js/perfect-scrollbar.min.js | 19 + .../css/perfect-scrollbar.css | 116 -- .../perfect-scrollbar/js/perfect-scrollbar.js | 1312 ----------------- .../js/perfect-scrollbar.min.js | 6 - user/function/function_profile.php | 20 +- user/language/zh-cn/lang.php | 4 +- user/login/template/getpasswd.htm | 20 +- user/login/template/getpasswd2.htm | 29 +- user/login/template/getpasswd3.htm | 25 +- user/login/template/login_single1.htm | 13 +- user/login/template/login_single2.htm | 22 +- user/login/template/login_single3.htm | 13 +- user/login/template/lostpasswd.htm | 16 +- user/login/template/lostpasswd2.htm | 16 +- user/login/template/lostpasswd3.htm | 13 +- user/profile/template/changeemail.htm | 2 +- user/profile/template/editpass.htm | 6 +- user/register/classes/checkvalue.php | 1 - user/register/register.php | 65 +- user/register/template/register.htm | 22 +- user/register/template/register2.htm | 32 +- user/register/template/register3.htm | 31 +- 114 files changed, 800 insertions(+), 2003 deletions(-) create mode 100644 static/image/common/addUser.png create mode 100644 static/js/perfect-scrollbar.min.js delete mode 100644 static/perfect-scrollbar/css/perfect-scrollbar.css delete mode 100644 static/perfect-scrollbar/js/perfect-scrollbar.js delete mode 100644 static/perfect-scrollbar/js/perfect-scrollbar.min.js diff --git a/admin/appmarket/cloudappmarket.php b/admin/appmarket/cloudappmarket.php index abf2b0a..48be68d 100644 --- a/admin/appmarket/cloudappmarket.php +++ b/admin/appmarket/cloudappmarket.php @@ -30,7 +30,7 @@ if( $json["status"]==1){ $total = $json["data"]["total"]; $perpage = $json["data"]["perpage"]; //$perpage =1; - $theurl = BASESCRIPT."?mod=".MOD_NAME."&op=cloudappmarket"; + $theurl = MOD_URL."&op=cloudappmarket"; $multi=multi($total, $perpage, $page, $theurl); } //print_r($list);exit; diff --git a/admin/appmarket/cp.php b/admin/appmarket/cp.php index 58fe033..e753378 100644 --- a/admin/appmarket/cp.php +++ b/admin/appmarket/cp.php @@ -97,11 +97,11 @@ elseif ($do == 'import') {//导入应用 cron_create($app); } - showmessage(lang('application_import_successful'), ADMINSCRIPT . '?mod=appmarket', array(), array('alert' => 'right')); + showmessage(lang('application_import_successful'), MOD_URL, array(), array('alert' => 'right')); } } else { $app = importByarray($apparray, 0); - showmessage('application_import_successful', ADMINSCRIPT . '?mod=appmarket', array(), array('alert' => 'right')); + showmessage('application_import_successful', MOD_URL, array(), array('alert' => 'right')); } } } @@ -212,7 +212,7 @@ elseif ($do == 'install') {//安装应用 if(empty($apparray['app']['app_path'])) $apparray['app']['app_path']=$dir; $filename = $apparray['app']['extra']['installfile']; - $request_uri = ADMINSCRIPT . '?mod=appmarket'; + $request_uri = MOD_NAME; if (!empty($filename) && preg_match('/^[\w\.]+$/', $filename)) { $filename = DZZ_ROOT . './'.$dir.'/' . $appname . '/' . $filename; if (file_exists($filename)) { @@ -228,7 +228,7 @@ elseif ($do == 'install') {//安装应用 cron_create($app); } writelog('otherlog', "安装应用 ".$apparray['app']['appname']); - showmessage('application_install_successful', ADMINSCRIPT . '?mod=appmarket', array(), array('alert' => 'right')); + showmessage('application_install_successful', MOD_URL, array(), array('alert' => 'right')); } } @@ -239,7 +239,7 @@ elseif ($do == 'uninstall') {//卸载应用 } $app['extra'] = unserialize($app['extra']); $finish = FALSE; - $request_uri = ADMINSCRIPT . '?mod=app'; + $request_uri = MOD_NAME; $refer = $_GET['refer']; $appinfo=$app; $msg=''; @@ -277,7 +277,7 @@ elseif ($do == 'uninstall') {//卸载应用 $temp_install=DZZ_ROOT.'./data/update/app/'.$app['app_path'].'/'.$app['identifier']; removedirectory($temp_install); writelog('otherlog', "卸载应用 ".$app['appname']); - showmessage($msg, ADMINSCRIPT . '?mod=appmarket', array(), array('alert' => 'right')); + showmessage($msg, MOD_URL, array(), array('alert' => 'right')); } } elseif ($do == 'uninstall_confirm') {//卸载应用 @@ -320,7 +320,7 @@ elseif ($do == 'upgrade') {//本地升级应用 } if ($finish) { C::t('app_market') -> update($appid, array('version' => $toversion)); - showmessage('application_upgrade_successful', ADMINSCRIPT . '?mod=appmarket', array(), array('alert' => 'right')); + showmessage('application_upgrade_successful', MOD_URL, array(), array('alert' => 'right')); } } diff --git a/admin/appmarket/edit.php b/admin/appmarket/edit.php index f5f009d..bf11266 100644 --- a/admin/appmarket/edit.php +++ b/admin/appmarket/edit.php @@ -36,13 +36,11 @@ if (submitcheck('appsubmit')) { 'appadminurl' => $appadminurl, 'identifier' => $identifier, 'app_path' => $app_path, - 'noticeurl' => trim($_GET['noticeurl']), 'haveflash' => intval($_GET['haveflash']), 'vendor' => trim($_GET['vendor']), 'hideInMarket' => intval($_GET['hideInMarket']), 'appdesc' => ($_GET['appdesc']), 'isshow' => intval($_GET['isshow']), - 'havetask' => intval($_GET['havetask']), 'feature' => $_GET['feature'], 'fileext' => $_GET['fileext'], 'group' => intval($_GET['group']), @@ -196,7 +194,6 @@ if (submitcheck('appsubmit')) { $app = array(); $app['hideInMarket'] = 0; $app['isshow'] = 1; - $app['havetask'] = 1; $app['haveflash'] = 0; $app['group'] = 1; } diff --git a/admin/appmarket/images/market.css b/admin/appmarket/images/market.css index a756d95..4ad7c9c 100644 --- a/admin/appmarket/images/market.css +++ b/admin/appmarket/images/market.css @@ -251,13 +251,11 @@ span.attach-item img{ overflow: hidden; text-overflow: ellipsis; } -.app-info>a{ - color:#999; + +.app-info{ + display: inline-block; } .app-info .select-info{ - position:absolute; - left:0; - top:0; display:none; } span.num { @@ -267,10 +265,12 @@ span.num { margin:0; } -.appname{ - margin:0; - line-height:25px; - +.app-name-wrapper { + padding-left: 55px; + position: relative; + max-width: 350px; + min-height: 50px; + display: inline-block; } .appname a{ font-weight:600; diff --git a/admin/appmarket/install_app_ajax.php b/admin/appmarket/install_app_ajax.php index 48495fe..7dce21d 100644 --- a/admin/appmarket/install_app_ajax.php +++ b/admin/appmarket/install_app_ajax.php @@ -406,7 +406,6 @@ elseif($operation == 'cross' || $operation == 'patch'){ $apparray['app']['identifier']=$baseinfo['new_identifier']; $apparray['app']['appurl']= str_replace("mod=".$baseinfo['identifier'],"mod=".$baseinfo['new_identifier'],$apparray['app']['appurl']); $apparray['app']['appadminurl']= str_replace("mod=".$baseinfo['identifier'],"mod=".$baseinfo['new_identifier'],$apparray['app']['appadminurl']); - $apparray['app']['noticeurl']= str_replace("mod=".$baseinfo['identifier'],"mod=".$baseinfo['new_identifier'],$apparray['app']['noticeurl']); $apparray['app']['identifier']= $baseinfo['new_identifier']; } diff --git a/admin/appmarket/list.php b/admin/appmarket/list.php index 8b3387a..5dd1c7a 100644 --- a/admin/appmarket/list.php +++ b/admin/appmarket/list.php @@ -12,7 +12,7 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { include libfile('function/admin'); include libfile('function/organization'); $do = empty($_GET['do']) ? 'available' : trim($_GET['do']); -$refer = urlencode(ADMINSCRIPT . '?mod=app&op=list&do=' . $do); +$refer = urlencode(MOD_NAME. '&op=list&do=' . $do); $grouptitle = array('0' => lang('all'), '-1' => lang('visitors_visible'), '1' => lang('members_available'), '2' => lang('section_administrators_available'), '3' => lang('system_administrators_available')); $list = array(); $op=$_GET['op']; diff --git a/admin/appmarket/template/appdefault.htm b/admin/appmarket/template/appdefault.htm index 06ff25e..0d32159 100644 --- a/admin/appmarket/template/appdefault.htm +++ b/admin/appmarket/template/appdefault.htm @@ -36,7 +36,7 @@
- +
@@ -47,7 +47,7 @@ - + diff --git a/admin/appmarket/template/cloudappmarket.htm b/admin/appmarket/template/cloudappmarket.htm index f3309fc..076e6e3 100644 --- a/admin/appmarket/template/cloudappmarket.htm +++ b/admin/appmarket/template/cloudappmarket.htm @@ -3,7 +3,7 @@ @@ -101,16 +70,14 @@
-
- -
@@ -122,25 +89,23 @@
-
+
-
-
- +
+
+
-
+
{eval $appadminurl=$value[appadminurl]?$value[appadminurl]:$value[appurl]} -

$value[appname] -

{eval echo $value[upgrade_version][desc_short]?$value[upgrade_version][desc_short]:lang('none');}
-

{lang installed}:$value[version]

+
{lang installed}:$value[version]
{lang newest}:$value[upgrade_version][version]
@@ -153,7 +118,7 @@
-
{lang sort} {lang application_name}
$value[appname]
+
diff --git a/admin/appmarket/upgrade_app_ajax.php b/admin/appmarket/upgrade_app_ajax.php index 4b797f2..ed2022f 100644 --- a/admin/appmarket/upgrade_app_ajax.php +++ b/admin/appmarket/upgrade_app_ajax.php @@ -26,7 +26,7 @@ if ($operation == 'check_upgrade' ) {//根据appid检查app应用是否需要更 $appinfo = C::t('app_market')->fetch($appid);//C::tp_t('app_market')->find( $appid ); $time =dgmdate(TIMESTAMP,'Ymd'); $return=array( - "url"=>ADMINSCRIPT .'?mod=appmarket&op=upgrade', + "url"=>MOD_URL.'&op=upgrade', "status"=>1, "percent"=>5, "second"=>500, @@ -39,9 +39,9 @@ if ($operation == 'check_upgrade' ) {//根据appid检查app应用是否需要更 if($appinfo["check_upgrade_time"]==$time){//今天已经检查过是否需要更新 if( $appinfo["upgrade_version"]!="" ){ - $return["url"] = ADMINSCRIPT .'?mod=appmarket&op=upgrade_app_ajax&appid='.$appid; + $return["url"] = MOD_URL.'&op=upgrade_app_ajax&appid='.$appid; if($appinfo["mid"]==0){ - $return["url"] = ADMINSCRIPT .'?mod=appmarket&op=upgrade_app_ajax&operation=localupgrade&appid='.$appid; + $return["url"] = MOD_URL.'&op=upgrade_app_ajax&operation=localupgrade&appid='.$appid; } exit(json_encode($return));//已获取更新版本信息,待更新 }else{ @@ -57,7 +57,7 @@ if ($operation == 'check_upgrade' ) {//根据appid检查app应用是否需要更 $importtxt = @implode('', file($file)); $apparray = getimportdata('Dzz! app'); if($apparray["app"]["version"]!=$appinfo["version"]){ - $return["url"] = ADMINSCRIPT .'?mod=appmarket&op=upgrade_app_ajax&operation=localupgrade&appid='.$appid; + $return["url"] = MOD_URL.'&op=upgrade_app_ajax&operation=localupgrade&appid='.$appid; } else{ $return["status"]=0; $return["msg"]=lang("app_upgrade_to_lastversion"); @@ -82,7 +82,7 @@ if ($operation == 'check_upgrade' ) {//根据appid检查app应用是否需要更 "check_upgrade_time"=>dgmdate(TIMESTAMP,'Ymd') ); $re=C::t('app_market')->update($appid,$map);//C::tp_t('app_market')->where("appid=".$appid)->save( $map ); - $return["url"] = ADMINSCRIPT .'?mod=appmarket&op=upgrade_app_ajax&appid='.$appid; + $return["url"] = MOD_URL.'&op=upgrade_app_ajax&appid='.$appid; exit(json_encode($return));//需要更新 } else { $map=array( @@ -100,7 +100,7 @@ if ($operation == 'check_upgrade' ) {//根据appid检查app应用是否需要更 elseif($operation == 'upgrade' ){ $appid = $_GET["appid"]; $return=array( - "url"=>ADMINSCRIPT .'?mod=appmarket&op=upgrade', + "url"=>MOD_URL.'&op=upgrade', "status"=>1, "percent"=>10, "second"=>1, @@ -166,13 +166,13 @@ elseif($operation == 'upgrade' ){ } }*/ - $linkurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=patch&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; + $linkurl = MOD_URL.'&op=upgrade_app_ajax&operation=patch&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; $return["url"]=$linkurl; exit(json_encode($return)); } elseif($operation == 'cross' || $operation == 'patch'){ $return=array( - "url"=>ADMINSCRIPT .'?mod=appmarket&op=upgrade', + "url"=>MOD_URL.'&op=upgrade', "status"=>1, "percent"=>10, "second"=>0, @@ -204,7 +204,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ $appid = $_GET["appid"]; $appinfo = C::t('app_market')->fetch($appid);//C::tp_t('app_market')->find( $appid ); if( !$appinfo["upgrade_version"] ){ - $linkurl=ADMINSCRIPT.'?mod=appmarket&op=upgrade'; + $linkurl=MOD_URL.'&op=upgrade'; $return["url"]=$linkurl; $return["status"]=0; $return["msg"]= lang( "app_upgrade_data_error" ); @@ -222,7 +222,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ $upgradeinfo=getappidentifier($upgradeinfo); //获取并判断新标识名称 //如果有新标识名称 抛出错误停止更新 if( isset( $upgradeinfo["new_identifier"]) && $upgradeinfo["new_identifier"] ){ - $linkurl=ADMINSCRIPT.'?mod=appmarket&op=upgrade'; + $linkurl=MOD_URL.'&op=upgrade'; $return["url"]=$linkurl; $return["status"]=0; $return["msg"]= lang( $upgradeinfo["app_path"]."/".$upgradeinfo["identifier"]." 目录已存在,请重命名该目录或移除,防止重复或覆盖" ); @@ -260,13 +260,13 @@ elseif($operation == 'cross' || $operation == 'patch'){ //与本地文件对比过滤出更新文件 list($updatefilelist, $updatemd5filelist) = $dzz_upgrade->compare_basefile_bymd5($appinfo, $updatefilelist,$updatemd5filelist); - $theurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; + $theurl = MOD_URL.'&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; if(empty($updatefilelist)) { $return["status"]=0; $return["msg"]= lang('app_upgrade_exchange_none', array('upgradeurl' => upgradeinformation_app(-9))); exit(json_encode($return)); }*/ - $theurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; + $theurl = MOD_URL.'&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; } if($step == 1) { @@ -353,7 +353,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ //与本地文件对比过滤出更新文件 list($updatefilelist, $updatemd5filelist) = $dzz_upgrade->compare_basefile_bymd5($appinfo, $updatefilelist,$updatemd5filelist); - $theurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; + $theurl = MOD_URL.'&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&locale=' . $locale . '&charset=' . $charset; if(empty($updatefilelist)) {//不存在修改的继续执行 //$return["status"]=0; //$return["msg"]= lang('app_upgrade_exchange_none', array('upgradeurl' => upgradeinformation_app(-9))); @@ -517,7 +517,6 @@ elseif($operation == 'cross' || $operation == 'patch'){ $apparray['app']['identifier']=$appinfo['identifier'];//$appinfo['new_identifier']; $apparray['app']['appurl']= str_replace("mod=".$upgradeinfo['identifier'],"mod=".$appinfo['identifier'],$appinfo['app']['appurl']); $apparray['app']['appadminurl']= str_replace("mod=".$upgradeinfo['identifier'],"mod=".$appinfo['identifier'],$appinfo['app']['appadminurl']); - $apparray['app']['noticeurl']= str_replace("mod=".$upgradeinfo['identifier'],"mod=".$appinfo['identifier'],$appinfo['app']['noticeurl']); $apparray['app']['identifier']= $appinfo['identifier']; $apparray['app']['check_upgrade_time']= 0 ; } @@ -528,7 +527,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ writelog('otherlog', "更新应用 ".$apparray['app']['appname']); } - $linkurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$_GET["appid"]. '&step=5&confirm=' . $confirm; + $linkurl = MOD_URL.'&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$_GET["appid"]. '&step=5&confirm=' . $confirm; $return["url"]=$linkurl; $return["percent"]=80; $return["second"]=300; @@ -538,7 +537,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ exit; } - $linkurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&step=5&confirm=' . $confirm; + $linkurl = MOD_URL.'&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&step=5&confirm=' . $confirm; $return["url"]=$linkurl; $return["percent"]=80; @@ -564,7 +563,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ $re=C::t('app_market')->update( $appid,$map); updatecache('setting'); - $return["url"] = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=check_upgrade&appid='.$appinfo["appid"]; + $return["url"] = MOD_URL.'&op=upgrade_app_ajax&operation=check_upgrade&appid='.$appinfo["appid"]; $return["percent"]=100; $return["second"]=300; $return["step"]=5; @@ -609,15 +608,23 @@ elseif($operation == 'localupgrade' ){ if ($finish) { $map=array( "mid"=>$mid, - "version"=>$toversion, + "version"=>$toversion, + "vendor"=>$apparray['app']['vendor'], + "appurl"=>$apparray['app']['appurl'], + "isshow"=>$apparray['app']['isshow'], + "open"=>$apparray['app']['open'], + "fileext"=>$apparray['app']['fileext'], + "appname"=>$apparray['app']['appname'], + "app_path"=>$apparray['app']['app_path'], + "appdesc"=>$apparray['app']['appdesc'], "upgrade_version"=>"", "check_upgrade_time"=>0 ); - + C::t('app_open') -> insert_by_exts($appid, $apparray['app']['fileext']); $re=C::t('app_market')->update($appid,$map);//C::tp_t('app_market')->where("appid=".$appid)->save( $map ); } - $return["url"] = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=check_upgrade&appid='.$app["appid"]; + $return["url"] = MOD_URL.'&op=upgrade_app_ajax&operation=check_upgrade&appid='.$app["appid"]; $return["percent"]=100; $return["second"]=300; $return["step"]=5; diff --git a/admin/cloud/edit.php b/admin/cloud/edit.php index 76d6002..c41733f 100644 --- a/admin/cloud/edit.php +++ b/admin/cloud/edit.php @@ -27,7 +27,7 @@ if($_GET['do']=='usercloud'){ $page = empty($_GET['page'])?1:intval($_GET['page']); $perpage=20; $start=($page-1)*$perpage; - $theurl=BASESCRIPT.'?mod=cloud&op=edit&do=usercloud&bz='.$bz; + $theurl=MOD_URL.'&op=edit&do=usercloud&bz='.$bz; $dname=$cloud['dname']; $count=DB::result_first("select COUNT(*) from ".DB::table($dname)." where bz='{$bz}' and uid>0"); foreach(DB::fetch_all("select * from ".DB::table($dname)." where bz='{$bz}' and uid>0 order by dateline DESC limit $start,$perpage") as $value1){ diff --git a/admin/cloud/routeredit.php b/admin/cloud/routeredit.php index e1a9dbf..9d8418a 100644 --- a/admin/cloud/routeredit.php +++ b/admin/cloud/routeredit.php @@ -28,7 +28,7 @@ if(submitcheck('addroutersubmit')){ C::t('local_router')->insert($router); } - showmessage('do_success',BASESCRIPT.'?mod=cloud&op=router'); + showmessage('do_success',MOD_URL.'&op=router'); }else{ $routerid=intval($_GET['routerid']); $router=C::t('local_router')->fetch_by_routerid($routerid); diff --git a/admin/cloud/template/cloud.htm b/admin/cloud/template/cloud.htm index ad75474..673a5a7 100644 --- a/admin/cloud/template/cloud.htm +++ b/admin/cloud/template/cloud.htm @@ -15,7 +15,7 @@
-
$multi
+
diff --git a/admin/cloud/template/edit.htm b/admin/cloud/template/edit.htm index c191e34..fafbd1a 100644 --- a/admin/cloud/template/edit.htm +++ b/admin/cloud/template/edit.htm @@ -56,7 +56,7 @@ -
{lang sort}
+
@@ -188,7 +188,7 @@ -
+
diff --git a/admin/cloud/template/router.htm b/admin/cloud/template/router.htm index a03b34a..0b0ce21 100644 --- a/admin/cloud/template/router.htm +++ b/admin/cloud/template/router.htm @@ -23,7 +23,7 @@ -
+
@@ -73,7 +73,7 @@ function checkspace(obj, routerid) { jQuery(obj).html(''); - jQuery.getJSON('{ADMINSCRIPT}?mod=cloud&op=space&do=checkspace&routerid=' + routerid, function(json) { + jQuery.getJSON('{MOD_URL}&op=space&do=checkspace&routerid=' + routerid, function(json) { if(json.error) { jQuery(this).html('' + json.error + ''); } else { diff --git a/admin/cloud/template/space.htm b/admin/cloud/template/space.htm index dd9204a..d15767b 100644 --- a/admin/cloud/template/space.htm +++ b/admin/cloud/template/space.htm @@ -22,7 +22,7 @@ -
  {lang priority}
+
@@ -67,7 +67,7 @@ function checkspace(obj,remoteid){ jQuery(obj).html(''); - jQuery.getJSON('{ADMINSCRIPT}?mod=cloud&op=space&do=checkspace&remoteid='+remoteid,function(json){ + jQuery.getJSON('{MOD_URL}&op=space&do=checkspace&remoteid='+remoteid,function(json){ if(json.error){ jQuery(this).html(''+json.error+''); }else{ diff --git a/admin/cloud/template/spaceadd.htm b/admin/cloud/template/spaceadd.htm index 4c90f6c..51757e9 100644 --- a/admin/cloud/template/spaceadd.htm +++ b/admin/cloud/template/spaceadd.htm @@ -41,23 +41,23 @@ function connect_start(bz, type) { //开始云连接 switch(type) { case 'pan': - url = '{ADMINSCRIPT}?mod=cloud&bz=' + bz + '&op=oauth'; + url = '{MOD_URL}&bz=' + bz + '&op=oauth'; window.location.href = url; break; case 'storage': - url = '{ADMINSCRIPT}?mod=cloud&bz=' + bz + '&op=oauth'; + url = '{MOD_URL}&bz=' + bz + '&op=oauth'; window.location.href = url; break; case 'ftp': - url = '{ADMINSCRIPT}?mod=cloud&bz=' + bz + '&op=oauth'; + url = '{MOD_URL}&bz=' + bz + '&op=oauth'; window.location.href = url; break; case 'disk': - url = '{ADMINSCRIPT}?mod=cloud&bz=' + bz + '&op=oauth'; + url = '{MOD_URL}&bz=' + bz + '&op=oauth'; window.location.href = url; break; default: - url = '{ADMINSCRIPT}?mod=cloud&bz=' + bz + '&op=oauth'; + url = '{MOD_URL}&bz=' + bz + '&op=oauth'; window.location.href = url; break; } diff --git a/admin/language/zh-cn/lang.php b/admin/language/zh-cn/lang.php index fd16192..ceecf02 100644 --- a/admin/language/zh-cn/lang.php +++ b/admin/language/zh-cn/lang.php @@ -13,7 +13,7 @@ if(!defined('IN_DZZ')) { $lang = array ( - 'page_background'=>'登录背景', + 'page_background'=>'登录页面背景', 'database_export_custom_invalid' => '您至少需要选择一个数据表进行备份', 'database_export_file_invalid' => '数据文件无法保存到服务器，请检查目录属性', 'admin_navtitle'=>'管理中心', diff --git a/admin/login/login.php b/admin/login/login.php index 208b6df..34bea01 100644 --- a/admin/login/login.php +++ b/admin/login/login.php @@ -66,11 +66,11 @@ function html_login_form() { global $_G; $uid = getglobal('uid'); $isguest = !getglobal('uid'); + $navtitle = lang('title_admincp'); $lang1 = lang(); $maintitle=lang('title_admincp'); $loginuser = $isguest ? '
' : '
' . $_G['member']['username'] . '
' . $_G['member']['email'] . '
'; - $loginuser2 = $isguest ? '
' : '
' . $_G['member']['username'] . '
'; $sid = getglobal('sid'); $avatarstatus=getglobal('avatarstatus','member'); if(!$uid ){ diff --git a/admin/member/profileset.php b/admin/member/profileset.php index 7c0acf1..95eb2d3 100644 --- a/admin/member/profileset.php +++ b/admin/member/profileset.php @@ -55,7 +55,7 @@ if($do=='delete'){ if(!$field['isfixed2']) { $_POST['title'] = dhtmlspecialchars(trim($_POST['title'])); if(empty($_POST['title'])) { - showmessage('data_name_empty', ADMINSCRIPT.'?mod=member&op=profileset&fieldid='.$fieldid, array(),array('alert'=>'error')); + showmessage('data_name_empty', MOD_URL.'&op=profileset&fieldid='.$fieldid, array(),array('alert'=>'error')); } $setarr['title'] = $_POST['title']; $setarr['description'] = dhtmlspecialchars(trim($_POST['description'])); @@ -100,7 +100,7 @@ if($do=='delete'){ } updatecache(array('profilesetting','fields_required', 'fields_optional', 'fields_register', 'setting')); - showmessage('subscriber_data_edit_success', ADMINSCRIPT.'?mod=member&op=profileset', array(),array('alert'=>'right')); + showmessage('subscriber_data_edit_success', MOD_URL.'&op=profileset', array(),array('alert'=>'right')); } }else { diff --git a/admin/member/template/profileset.htm b/admin/member/template/profileset.htm index 8fcf712..eaaa030 100644 --- a/admin/member/template/profileset.htm +++ b/admin/member/template/profileset.htm @@ -49,7 +49,7 @@ -
{lang sort}
+
@@ -63,7 +63,7 @@ - + @@ -130,9 +130,9 @@ function addRow(obj) { var html = '' + - '' + - '' + - '' + + '' + + '' + + '' + '' + '' + '' + diff --git a/admin/member/template/verify.htm b/admin/member/template/verify.htm index 22fc9f9..50f4c22 100644 --- a/admin/member/template/verify.htm +++ b/admin/member/template/verify.htm @@ -111,7 +111,7 @@ -
{lang sort} {lang identifier}
$fieldid $value[title] checked="checked"value="1">
+
diff --git a/admin/member/template/verifyset.htm b/admin/member/template/verifyset.htm index 2582918..44b8fc4 100644 --- a/admin/member/template/verifyset.htm +++ b/admin/member/template/verifyset.htm @@ -44,7 +44,7 @@ -
{lang username}
+
diff --git a/admin/member/verify.php b/admin/member/verify.php index d385b02..0f05b09 100644 --- a/admin/member/verify.php +++ b/admin/member/verify.php @@ -39,7 +39,7 @@ if ($anchor != 'pass') { if (!submitcheck('verifysubmit', true)) { $navtitle = $vid ? $_G['setting']['verify'][$vid]['title'] : lang('members_verify_profile').' - '.lang('appname'); - $thurl = ADMINSCRIPT . '?mod=member&op=verify&anchor=' . $anchor . '&vid=' . $vid; + $thurl = MOD_URL.'&op=verify&anchor=' . $anchor . '&vid=' . $vid; if ($anchor == 'refusal') { $_GET['flag'] = -1; } elseif ($anchor == 'authstr') { @@ -255,7 +255,7 @@ if (!submitcheck('verifysubmit', true)) { echo $verifylist; exit(); } else { - showmessage('members_verify_succeed', ADMINSCRIPT . '?mod=member&op=verify&vid=' . $vid . '&anchor=pass', array(), array('alert' => 'right')); + showmessage('members_verify_succeed', MOD_URL.'&op=verify&vid=' . $vid . '&anchor=pass', array(), array('alert' => 'right')); } } else { $vids = array(); @@ -342,7 +342,7 @@ if (!submitcheck('verifysubmit', true)) { if ($single) { echo ""; } else { - showmessage('members_verify_succeed', ADMINSCRIPT . '?mod=member&op=verify&vid=' . $vid . '&anchor=' . $_GET['anchor'], array(), array('alert' => 'right')); + showmessage('members_verify_succeed', MOD_URL.'&op=verify&vid=' . $vid . '&anchor=' . $_GET['anchor'], array(), array('alert' => 'right')); } } } diff --git a/admin/member/verifyset.php b/admin/member/verifyset.php index d785a0c..835eb6e 100644 --- a/admin/member/verifyset.php +++ b/admin/member/verifyset.php @@ -92,7 +92,7 @@ if ($do == 'edit') { C::t('setting') -> update('verify', $_G['setting']['verify']); updatecache(array('setting')); - showmessage('members_verify_save_success', ADMINSCRIPT . '?mod=member&op=verifyset', array(), array('alert' => 'right')); + showmessage('members_verify_save_success', MOD_URL.'&op=verifyset', array(), array('alert' => 'right')); } include template('verifyset_edit'); } else { diff --git a/admin/setting/index.php b/admin/setting/index.php index eb0c7c1..08cd329 100644 --- a/admin/setting/index.php +++ b/admin/setting/index.php @@ -290,30 +290,44 @@ if (!submitcheck('settingsubmit')) { savecache('censor', $data); showmessage('do_success', dreferer()); }elseif ($operation == 'loginset') { - if ($back = trim($settingnew['loginset']['background'])) { + if ($back = trim($settingnew['loginset']['background'])) { if (strpos($back, '#') === 0) { - $settingnew['loginset']['url'] = ''; - $settingnew['loginset']['img'] = ''; + $settingnew['loginset']['bcolor'] = $back; } else { $arr = explode('.', $back); $ext = array_pop($arr); if ($ext && in_array(strtolower($ext), array('jpg', 'jpeg', 'gif', 'png'))) { $settingnew['loginset']['img'] = $back; - $settingnew['loginset']['url'] = ''; + $settingnew['loginset']['bcolor'] = ''; } else { $settingnew['loginset']['url'] = $back; - $settingnew['loginset']['img'] = ''; + $settingnew['loginset']['bcolor'] = ''; } } + } else { + $settingnew['loginset']['bcolor'] = ''; } - if ($back = trim($settingnew['loginset']['bcolor'])) { - if (strpos($back, '#') === 0) { - $settingnew['loginset']['bcolor'] = $back; + if ($back = trim($settingnew['loginset']['kbcolor'])) { + if (strpos($back, '#') === 0 || strpos($back, 'rgb') === 0) { + $settingnew['loginset']['kbcolor'] = $back; }else { - $settingnew['loginset']['bcolor'] =''; + $arr = explode('.', $back); + $ext = array_pop($arr); + if ($ext && in_array(strtolower($ext), array('jpg', 'jpeg', 'gif', 'png'))) { + $settingnew['loginset']['kbcolor'] = $back; + }else { + $settingnew['loginset']['kbcolor'] =''; + } + } + } + if ($back = trim($settingnew['loginset']['transparency'])) { + if (strpos($back, '#') === 0 || strpos($back, 'rgb') === 0) { + $settingnew['loginset']['transparency'] = $back; + }else { + $settingnew['loginset']['transparency'] =''; } } - } elseif ($operation == 'qywechat') { + }elseif ($operation == 'qywechat') { switch($_GET['fbind']) { case 'bind' : $wechat = new qyWechat( array('appid' => $settingnew['CorpID'], 'appsecret' => $settingnew['CorpSecret'])); diff --git a/admin/setting/smiley.php b/admin/setting/smiley.php index ae8e0f0..738bcf3 100644 --- a/admin/setting/smiley.php +++ b/admin/setting/smiley.php @@ -92,7 +92,7 @@ if (!$operation) { $smurl = './static/image/smiley/' . $smtype['directory']; $smdir = DZZ_ROOT . $smurl; if (!is_dir($smdir)) { - showmessage(lang('smilies_directory_invalid', array('smurl' => $smurl)), ADMINSCRIPT . '?mod=setting&op=smiley'); + showmessage(lang('smilies_directory_invalid', array('smurl' => $smurl)), MOD_URL.'&op=smiley'); } } @@ -101,9 +101,9 @@ if (!$operation) { if ($smilies['smilies']) { addsmilies($id, $smilies['smilies']); updatecache(array('smilies', 'smileycodes', 'smilies_js')); - showmessage(lang('smilies_update_succeed', array('smurl' => $smurl, 'num' => $smilies['num'], 'typename' => $smtype['name'])), ADMINSCRIPT . '?mod=setting&op=smiley'); + showmessage(lang('smilies_update_succeed', array('smurl' => $smurl, 'num' => $smilies['num'], 'typename' => $smtype['name'])), MOD_URL.'&op=smiley'); } else { - showmessage(lang('smilies_update_error', array('smurl' => $smurl)), ADMINSCRIPT . '?mod=setting&op=smiley'); + showmessage(lang('smilies_update_error', array('smurl' => $smurl)), MOD_URL.'&op=smiley'); } } elseif ($operation == 'edit' && $id) { $smtype = C::t('imagetype') -> fetch($id); @@ -119,7 +119,7 @@ if (!$operation) { $start_limit = ($page - 1) * $smiliesperpage; $num = C::t('smiley') -> count_by_type_typeid('smiley', $id); - $multipage = multi($num, $smiliesperpage, $page, ADMINSCRIPT . '?mod=setting&op=smiley&operation=edit&id=' . $id); + $multipage = multi($num, $smiliesperpage, $page, MOD_URL.'&op=smiley&operation=edit&id=' . $id); $smileynum = 1; $smilies = ''; diff --git a/admin/setting/template/ajax.htm b/admin/setting/template/ajax.htm index 8b9065b..fff46a1 100644 --- a/admin/setting/template/ajax.htm +++ b/admin/setting/template/ajax.htm @@ -29,7 +29,7 @@
-
+
checked="checked" > diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm index 559e1ff..b2918c7 100644 --- a/admin/setting/template/main.htm +++ b/admin/setting/template/main.htm @@ -649,28 +649,30 @@
- 可以输入以('jpg', 'jpeg', 'gif', 'png')为后缀名的图片或输入网址,设置的图片或网站会同步到首页背景设置。 + {lang for_color_set}设置的图片或网站会同步到首页背景设置。
- +
-
- - -
- 只能输入颜色(如:#fff) + + 可以为颜色(如:#FFF);图片(以.jpeg,.jpg,.png结尾)。
- +
-
- -
只能输入颜色(如:rgba(8, 169, 249, 0.57))
+
+
+ +
+
+ checked="checked"> +
+
@@ -703,10 +705,6 @@ - - - - '; @@ -354,9 +354,9 @@ elseif ($operation == 'check') { if (!empty($upgrade_step['cachevalue'])) { $upgrade_step['cachevalue'] = dunserialize($upgrade_step['cachevalue']); if (!empty($upgrade_step['cachevalue']['step'])) { - $theurl = ADMINSCRIPT . '?mod=system&op=systemupgrade&operation=' . $upgrade_step['cachevalue']['operation'] . '&version=' . $upgrade_step['cachevalue']['version'] . '&locale=' . $upgrade_step['cachevalue']['locale'] . '&charset=' . $upgrade_step['cachevalue']['charset']; + $theurl = MOD_URL.'&op=systemupgrade&operation=' . $upgrade_step['cachevalue']['operation'] . '&version=' . $upgrade_step['cachevalue']['version'] . '&locale=' . $upgrade_step['cachevalue']['locale'] . '&charset=' . $upgrade_step['cachevalue']['charset']; - $recheckurl = ADMINSCRIPT . '?mod=system&op=systemupgrade&operation=recheck'; + $recheckurl = MOD_URL.'&op=systemupgrade&operation=recheck'; if ($upgrade_step['cachevalue']['step'] == 'dbupdate') { $dbreturnurl = $_G['siteurl'] . $theurl . '&step=5'; $stepurl = $_G['siteurl'] . 'install/update.php?step=prepare&from=' . rawurlencode($dbreturnurl) . '&frommd5=' . rawurlencode(md5($dbreturnurl . $_G['config']['security']['authkey'])); @@ -416,7 +416,7 @@ elseif ($operation == 'showupgrade') { if (version_compare($upgrade['phpversion'], PHP_VERSION) > 0 || version_compare($upgrade['mysqlversion'], $dbversion) > 0) { $unupgrade = 1; } - $list[$type]['linkurl'] = $linkurl = ADMINSCRIPT . '?mod=system&op=systemupgrade&operation=' . $type . '&version=' . $upgrade['latestversion'] . '&locale=' . $locale . '&charset=' . $charset; + $list[$type]['linkurl'] = $linkurl = MOD_URL.'&op=systemupgrade&operation=' . $type . '&version=' . $upgrade['latestversion'] . '&locale=' . $locale . '&charset=' . $charset; if ($unupgrade) { $list[$type]['title'] = 'DzzOffice' . $upgrade['latestversion'] . '_' . $locale . '_' . $charset; $list[$type]['btn1'] = lang('founder_upgrade_require_config') . ' php v' . PHP_VERSION . 'MYSQL v' . $dbversion; diff --git a/admin/system/template/cron.htm b/admin/system/template/cron.htm index 8369423..7f8f7af 100644 --- a/admin/system/template/cron.htm +++ b/admin/system/template/cron.htm @@ -110,7 +110,7 @@
-
{lang enable} {lang authentication_code}
+
diff --git a/admin/system/template/database.htm b/admin/system/template/database.htm index a2a0d9f..bfc8795 100644 --- a/admin/system/template/database.htm +++ b/admin/system/template/database.htm @@ -63,7 +63,7 @@
- +
@@ -99,7 +99,7 @@
- +
@@ -135,7 +135,7 @@
-
{lang name}
+
diff --git a/admin/system/template/upgrade.htm b/admin/system/template/upgrade.htm index 3fc17e1..2d89d89 100644 --- a/admin/system/template/upgrade.htm +++ b/admin/system/template/upgrade.htm @@ -65,7 +65,7 @@ -
{lang filename}
+
@@ -92,7 +92,7 @@ -
{lang founder_upgrade_select_version}
+
@@ -121,7 +121,7 @@ -
{lang founder_upgrade_preupdatelist}
+
diff --git a/admin/systemlog/template/admin.htm b/admin/systemlog/template/admin.htm index e473afd..9f4225e 100644 --- a/admin/systemlog/template/admin.htm +++ b/admin/systemlog/template/admin.htm @@ -78,7 +78,7 @@ html, body {
-
{lang founder_upgrade_diff_show}
+
diff --git a/avatar.php b/avatar.php index d0f806b..1365f61 100644 --- a/avatar.php +++ b/avatar.php @@ -13,7 +13,7 @@ $uid = isset($_GET['uid']) ? $_GET['uid'] : 0; $size = isset($_GET['size']) ? $_GET['size'] : ''; $random = isset($_GET['random']) ? $_GET['random'] : ''; $type = isset($_GET['type']) ? $_GET['type'] : ''; -$check = isset($_GET['check_file_exists']) ? $_GET['check_file_exists'] : ''; +$check = $_GET['check_file_exists'] ?? ''; $avatar = './data/avatar/'.get_avatar($uid, $size, $type); if(file_exists(dirname(__FILE__).'/'.$avatar)) { @@ -41,7 +41,8 @@ if(empty($random)) { header('Location: '.SITEURL.'/'.$avatar_url); exit; -function get_avatar($uid, $size = 'middle', $type = '') { +function get_avatar($uid, $size = 'middle', $type = ''): string +{ $size = in_array($size, array('big', 'middle', 'small')) ? $size : 'middle'; $uid = abs(intval($uid)); $uid = sprintf("%09d", $uid); @@ -52,4 +53,4 @@ function get_avatar($uid, $size = 'middle', $type = '') { return $dir1.'/'.$dir2.'/'.$dir3.'/'.substr($uid, -2).$typeadd."_avatar_$size.jpg"; } -?> + diff --git a/core/class/dzz/Hook.php b/core/class/dzz/Hook.php index d044e8a..c2076ed 100644 --- a/core/class/dzz/Hook.php +++ b/core/class/dzz/Hook.php @@ -4,12 +4,10 @@ class Hook { private static $tags = array(); - public static $usetag = array(); /** * 动态添加行为扩展到某个标签 * @param string $tag 标签名称 * @param mixed $behavior 行为名称 - * @param mixed $behavior 行为名称 * @param bool $first 是否放到开头执行 * @return void */ diff --git a/core/class/dzz/apprun.php b/core/class/dzz/apprun.php index 023976c..8c55179 100644 --- a/core/class/dzz/apprun.php +++ b/core/class/dzz/apprun.php @@ -3,7 +3,7 @@ namespace core\dzz; use \core as C; -class Apprun{ +class apprun{ public function run(){ diff --git a/core/class/dzz/config.php b/core/class/dzz/config.php index 0034b12..34c6154 100644 --- a/core/class/dzz/config.php +++ b/core/class/dzz/config.php @@ -1,7 +1,7 @@ init_misc) { return false; } diff --git a/core/class/dzz/dzz_error.php b/core/class/dzz/dzz_error.php index 74efa61..c5bfdac 100644 --- a/core/class/dzz/dzz_error.php +++ b/core/class/dzz/dzz_error.php @@ -244,7 +244,7 @@ EOT; if(!empty($phpmsg)) { echo '
'; echo '

PHP Debug

'; - echo '
{lang logtypename}
'; + echo '
'; echo ''; if(is_array($phpmsg)) { foreach($phpmsg as $k => $msg) { @@ -289,7 +289,7 @@ EOT; 'errormsg'=> '考虑到系统的稳定性' ); $action = 'Error'; - $type = 'Error_' . $vid; + $type = 'Error_' . $value['uid']; dzz_notification::notification_add($value['uid'], $type, $action, $notevars); } diff --git a/core/class/dzz/dzz_session.php b/core/class/dzz/dzz_session.php index 40781f2..48bd523 100644 --- a/core/class/dzz/dzz_session.php +++ b/core/class/dzz/dzz_session.php @@ -9,7 +9,7 @@ class dzz_session { public $sid = null; public $var; public $isnew = false; - private $newguest = array('sid' => 0, 'ip1' => 0, 'ip2' => 0, 'ip3' => 0, 'ip4' => 0, + private $newguest = array('sid' => 0, 'ip' => '', 'uid' => 0, 'username' => '', 'groupid' => 0, 'invisible' => 0, 'action' => 0, 'lastactivity' => 0, 'lastolupdate' => 0); @@ -27,27 +27,16 @@ class dzz_session { $this->init($sid, $ip, $uid); } } - public function set($key, $value) { if(isset($this->newguest[$key])) { $this->var[$key] = $value; - } elseif ($key == 'ip') { - $ips = explode('.', $value); - $this->set('ip1', $ips[0]); - $this->set('ip2', $ips[1]); - $this->set('ip3', $ips[2]); - $this->set('ip4', $ips[3]); } } - public function get($key) { if(isset($this->newguest[$key])) { return $this->var[$key]; - } elseif ($key == 'ip') { - return $this->get('ip1').'.'.$this->get('ip2').'.'.$this->get('ip3').'.'.$this->get('ip4'); } } - public function init($sid, $ip, $uid) { $this->old = array('sid' => $sid, 'ip' => $ip, 'uid' => $uid); $session = array(); @@ -109,10 +98,6 @@ class dzz_session { return $this->table->count_invisible($type); } - public function update_by_ipban($ip1, $ip2, $ip3, $ip4) { - return $this->table->update_by_ipban($ip1, $ip2, $ip3, $ip4); - } - public function update_max_rows($max_rows) { return $this->table->update_max_rows($max_rows); } @@ -120,8 +105,6 @@ class dzz_session { public function clear() { return $this->table->clear(); } - - public function fetch_by_uid($uid) { diff --git a/core/class/dzz/dzz_session_close.php b/core/class/dzz/dzz_session_close.php index a844098..295ca21 100644 --- a/core/class/dzz/dzz_session_close.php +++ b/core/class/dzz/dzz_session_close.php @@ -12,12 +12,11 @@ class dzz_session_close { public $sid = null; public $var; public $isnew = false; - protected $newguest = array('sid' => 0, 'ip1' => 0, 'ip2' => 0, 'ip3' => 0, 'ip4' => 0, + protected $newguest = array('sid' => 0, 'ip' => '', 'uid' => 0, 'username' => '', 'groupid' => 0, 'invisible' => 0, 'action' => 0, 'lastactivity' => 0, 'fid' => 0, 'tid' => 0, 'lastolupdate' => 0); protected $table; - public function __construct($sid = '', $ip = '', $uid = 0) { $this->old = array('sid' => $sid, 'ip' => $ip, 'uid' => $uid); $this->var = $this->newguest; @@ -34,20 +33,12 @@ class dzz_session_close { public function set($key, $value) { if(isset($this->newguest[$key])) { $this->var[$key] = $value; - } elseif ($key == 'ip') { - $ips = explode('.', $value); - $this->set('ip1', $ips[0]); - $this->set('ip2', $ips[1]); - $this->set('ip3', $ips[2]); - $this->set('ip4', $ips[3]); } } public function get($key) { if(isset($this->newguest[$key])) { return $this->var[$key]; - } elseif ($key == 'ip') { - return $this->get('ip1').'.'.$this->get('ip2').'.'.$this->get('ip3').'.'.$this->get('ip4'); } } @@ -120,11 +111,6 @@ class dzz_session_close { public function count_invisible($type = 1) { return $this->table->count_by_lastactivity_invisible($this->oltimestamp, $type); } - - public function update_by_ipban($ip1, $ip2, $ip3, $ip4) { - return false; - } - public function update_max_rows($max_rows) { return false; } diff --git a/core/class/table/table_app_market.php b/core/class/table/table_app_market.php index 6b6bfaa..f47a039 100644 --- a/core/class/table/table_app_market.php +++ b/core/class/table/table_app_market.php @@ -41,7 +41,6 @@ class table_app_market extends dzz_table $data['icon']=$data['appico']; $data['title']=$data['appname']; $data['url']=replace_canshu($data['appurl']); - $data['noticeurl']=replace_canshu($data['noticeurl']); if($havecount){ $data['viewnum']=intval($count['viewnum']); $data['replynum']=intval($count['replynum']); @@ -68,7 +67,6 @@ class table_app_market extends dzz_table $data['icon']=$data['appico']; $data['title']=$data['appname']; $data['url']=replace_canshu($data['appurl']); - $data['noticeurl']=replace_canshu($data['noticeurl']); if($havecount){ $data['viewnum']=intval($count['viewnum']); $data['replynum']=intval($count['replynum']); @@ -179,6 +177,13 @@ class table_app_market extends dzz_table } return DB::result_first("select appid from %t where $sql ",$param); } + public function fetch_appid($mod){ + $sql=''; + $param=array($this->_table); + $sql=" identifier = %s"; + $param[]=$mod; + return DB::result_first("select appid from %t where $sql ",$param); + } public function fetch_by_identifier($identifier,$app_path='dzz'){ return DB::fetch_first("select * from %t where app_path=%s and identifier=%s ",array($this->_table,$app_path,$identifier)); } diff --git a/core/class/table/table_session.php b/core/class/table/table_session.php index db9aeb1..ead39d0 100644 --- a/core/class/table/table_session.php +++ b/core/class/table/table_session.php @@ -26,7 +26,7 @@ class table_session extends dzz_table } $this->checkpk(); $session = parent::fetch($sid); - if($session && $ip !== false && $ip != "{$session['ip1']}.{$session['ip2']}.{$session['ip3']}.{$session['ip4']}") { + if($session && $ip !== false && $ip != "{$session['ip']}") { $session = array(); } if($session && $uid !== false && $uid != $session['uid']) { @@ -34,7 +34,6 @@ class table_session extends dzz_table } return $session; } - public function fetch_member($ismember = 0, $invisible = 0, $start = 0, $limit = 0) { $sql = array(); if($ismember === 1) { @@ -70,12 +69,11 @@ class table_session extends dzz_table $condition = " sid='{$session[sid]}' "; $condition .= " OR lastactivity<$onlinehold "; - $condition .= " OR (uid='0' AND ip1='{$session['ip1']}' AND ip2='{$session['ip2']}' AND ip3='{$session['ip3']}' AND ip4='{$session['ip4']}' AND lastactivity>$guestspan) "; + $condition .= " OR (uid='0' AND ".DB::field('ip', $session['ip'])." AND lastactivity>$guestspan) "; $condition .= $session['uid'] ? " OR (uid='{$session['uid']}') " : ''; DB::delete('session', $condition); } } - public function fetch_by_uid($uid) { return !empty($uid) ? DB::fetch_first('SELECT * FROM %t WHERE uid=%d', array($this->_table, $uid)) : false; } @@ -88,14 +86,6 @@ class table_session extends dzz_table return $data; } - public function update_by_ipban($ip1, $ip2, $ip3, $ip4) { - $ip1 = intval($ip1); - $ip2 = intval($ip2); - $ip3 = intval($ip3); - $ip4 = intval($ip4); - return DB::query('UPDATE '.DB::table('session')." SET groupid='6' WHERE ('$ip1'='-1' OR ip1='$ip1') AND ('$ip2'='-1' OR ip2='$ip2') AND ('$ip3'='-1' OR ip3='$ip3') AND ('$ip4'='-1' OR ip4='$ip4')"); - } - public function update_max_rows($max_rows) { return DB::query('ALTER TABLE '.DB::table('session').' MAX_ROWS='.dintval($max_rows)); } @@ -121,16 +111,15 @@ class table_session extends dzz_table public function count_by_ip($ip) { $count = 0; - if(!empty($ip) && ($ip = explode('.', $ip)) && count($ip) > 2 ) { - $count = DB::result_first('SELECT COUNT(*) FROM '.DB::table('session')." WHERE ip1='$ip[0]' AND ip2='$ip[1]' AND ip3='$ip[2]'"); + if(!empty($ip)) { + $count = DB::result_first('SELECT COUNT(*) FROM '.DB::table('session')." WHERE ".DB::field('ip', $ip)); } return $count; } - public function fetch_all_by_ip($ip, $start = 0, $limit = 0) { $data = array(); - if(!empty($ip) && ($ip = explode('.', $ip)) && count($ip) > 2 ) { - $data = DB::fetch_all('SELECT * FROM %t WHERE ip1=%d AND ip2=%d AND ip3=%d ORDER BY lastactivity DESC'.DB::limit($start, $limit), array($this->_table, $ip[0], $ip[1], $ip[2]), null); + if(!empty($ip)) { + $data = DB::fetch_all('SELECT * FROM %t WHERE ip=%s ORDER BY lastactivity DESC'.DB::limit($start, $limit), array($this->_table, $ip), null); } return $data; } diff --git a/core/core_version.php b/core/core_version.php index 0464f7c..2fef3d4 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.85.3'); - define('CORE_XHRELEASE', '20230831'); - define('CORE_XHFIXBUG' , '20230829'); + define('CORE_XHVERSION', '1.86'); + define('CORE_XHRELEASE', '20230909'); + define('CORE_XHFIXBUG' , '20230909'); } \ No newline at end of file diff --git a/core/template/default/common/adminlogin.htm b/core/template/default/common/adminlogin.htm index 6232e32..d3bf625 100644 --- a/core/template/default/common/adminlogin.htm +++ b/core/template/default/common/adminlogin.htm @@ -1,4 +1,5 @@ + - @@ -198,6 +202,6 @@ - + \ No newline at end of file diff --git a/dzz/system/template/notification.htm b/dzz/system/template/notification.htm index 4726dd4..ffa42b9 100644 --- a/dzz/system/template/notification.htm +++ b/dzz/system/template/notification.htm @@ -6,13 +6,9 @@
-
{eval echo avatar_block($value[authorid]);}
- - {eval echo avatar_block($value[authorid]);} -

$value[title]

diff --git a/dzz/system/template/orgtree.htm b/dzz/system/template/orgtree.htm index ac66c0b..1186da6 100644 --- a/dzz/system/template/orgtree.htm +++ b/dzz/system/template/orgtree.htm @@ -1,11 +1,13 @@ + @@ -21,7 +25,7 @@ -
+
No.FileLineCode