he/DzzOffice
1
0
Fork 0
mirror of https://github.com/DzzXH/DzzOffice.git synced 2026-03-01 12:32:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更新至v1.86，更新内容在笔记中查看

Browse Source
This commit is contained in:
小胡
2023-09-09 20:43:08 +08:00
Unverified
parent dcf8471f67
commit e417b11656
114 changed files with 800 additions and 2003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/appmarket/cloudappmarket.php
View File

@@ -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;

14
admin/appmarket/cp.php
View File

@@ -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'));
}
}

3
admin/appmarket/edit.php
View File

@@ -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;
}

18
admin/appmarket/images/market.css
View File

@@ -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;

1
admin/appmarket/install_app_ajax.php
View File

@@ -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'];
}

2
admin/appmarket/list.php
View File

@@ -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'];

4
admin/appmarket/template/appdefault.htm
View File

@@ -36,7 +36,7 @@
<form id="appform" name="appform" class="form-horizontal" action="{MOD_URL}&op=default" method="post">
<input type="hidden" name="appsubmit" value="true" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th style="min-width: 40px">{lang sort}</th>
<th style="min-width: 120px">{lang application_name}</th>
@@ -47,7 +47,7 @@
</thead>
<!--{loop $list $value}-->
<tr>
<td width="40"><input type="text" class="form-control input-sm" name="disp[{$value[appid]}]" value="$value[disp]" style="width:45px;" /></td>
<td width="40"><input type="text" class="form-control" name="disp[{$value[appid]}]" value="$value[disp]" style="width:45px;" /></td>
<td>
<a href="$value[appurl]"><img src="$value[appico]" />$value[appname]</a>
</td>

32
admin/appmarket/template/cloudappmarket.htm
View File

@@ -3,7 +3,7 @@
<style>
.app_upgradelist {
margin: auto;
padding: 8px;
padding: 8px 0;
border-bottom: 1px solid #f2f2f2;
position: relative;
display: flex;
@@ -16,12 +16,6 @@
height: 100%;
top:0;
}
.app-name-wrapper {
padding-left: 55px;
position: relative;
max-width: 350px;
min-height: 50px;
}
.app-name-wrapper .appicon {
position: absolute;
left: 0;
@@ -32,22 +26,11 @@
max-height: 45px;
margin: 0;
}
.app-name-wrapper .appname {
margin: 0;
line-height: 25px;
}
.app-name-wrapper .appname a {
color: #000;
font-weight: 500;
font-size: 14px;
}
.app-name-wrapper .appdesc {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 13px;
cursor: default;
}
.table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {
white-space: nowrap;
}
@@ -66,20 +49,11 @@
margin: 0;
vertical-align: text-bottom;
}
.app-info a {
color: #999;
}
.app-info .select-info {
position: absolute;
left: 30px;
top: 0;
display: none;
background-color: #FFF;
padding: 5px 10px;
}
#update_selected {
margin-left: 20px;
}
.checkbox-custom {
margin-bottom: 0;
}
@@ -96,7 +70,7 @@
<div class="app-info pull-left"> <a href="{MOD_URL}">{lang total}<span class="num">$total</span>{lang ge}{lang app}</a>
</div>
<div class="pull-right" style="color:#999;line-height: 34px;">{lang manual_install_tip}</div>
<div class="pull-right">{lang manual_install_tip}</div>
</div>
<div class="main-content clearfix" >
<div class="market-container" id="loopcontent">
@@ -105,7 +79,7 @@
<div id="progess_{$value[mid]}"> <span id="upgrade_progess_{$value[mid]}" class="upgrade_progess"></span> </div>
<div class="col-md-5 col-sm-5 col-xs-5" style="padding-left: 4px;">
<div class="app-name-wrapper" > <a href="javascript:;" data-href="{$cloudurl}?mod=dzzmarket&op=ajax&do=view&mid=$value[mid]&refer=$refer" class="appicon view-detail" title="$value[name]"><img src="$value[coverimg]" style="margin:0" /></a>
<p class="appname"> <a href="javascript:;" data-href="{$cloudurl}?mod=dzzmarket&op=ajax&do=view&mid=$value[mid]&refer=$refer" target="_blank" class="view-detail" title="$value[name]">$value[name]</a> <small class="text-muted" title="{lang version}">$value[version]</small></p>
<a href="javascript:;" data-href="{$cloudurl}?mod=dzzmarket&op=ajax&do=view&mid=$value[mid]&refer=$refer" target="_blank" class="view-detail" title="$value[name]">$value[name]</a> <small class="text-muted" title="{lang version}">$value[version]</small>
<div class="appdesc" title="$value['appdesc']">{eval echo $value[desc_short]?$value[desc_short]:lang('none');}</div>
</div>
</div>

2
admin/appmarket/template/cross.htm
View File

@@ -42,7 +42,7 @@
</div>
</div>
<!--{else}-->
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th colspan="5">{lang founder_upgrade_preupdatelist}</th>
</thead>

8
admin/appmarket/template/extopen.htm
View File

@@ -21,13 +21,13 @@
border:1px solid transparent;
}
.app_default_list li a{padding:2px;color:#333}
.app_default_list li a{padding:2px;}
.app_default_list li.isdefault1 a{color:rgba(76, 137, 251, 1)}
.app_default_list li .label-rightimg{margin:auto;display: none;position:absolute;right:3px;top:3px}
.app_default_list li.isdefault1 .label-rightimg{display: inline-block;width: auto}
.app_default_list li.isdefault,.app_default_list li.isdefault1{
border: 1px solid rgba(76, 137, 251, 1);
border-radius: var(--radius);
}
.table td img{max-height: 32px;max-width: 32px;}
.app_default_list li.ui-state-default{width: 150px;height: 38px;border: 1px solid #e1e1e1;display: block;background:#FFF }
@@ -44,7 +44,7 @@
<div class="bs-main-container">
<div class="main-content clearfix">
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<tr>
<th width="100">{lang default}</th>
@@ -63,7 +63,7 @@
<ul class="app_default_list clearfix">
<!--{loop $value $key2 $value2}-->
<li class="default_li isdefault{$value2[isdefault]}" title="{lang drag_can_be_sorted}" onclick="setdefault(this, '{$value2[extid]}' )">
<input class="form-control industry-add-one" name="extid[]" type="hidden" value="{$value2[extid]}" />
<input class="form-control" name="extid[]" type="hidden" value="{$value2[extid]}" />
<img class="default_li_icon" src="$value2[appdata][appico]" /><a href="javascript:;" title="{lang set_default}">$value2[appdata][appname]</a>
<img src="static/image/common/ic-filtrate.png" class="label-rightimg">
</li>

22
admin/appmarket/template/index.htm
View File

@@ -1,12 +1,6 @@
<!--{template common/header_simple_start}-->
<link href="{MOD_PATH}/images/market.css?{VERHASH}" rel="stylesheet" media="all">
<style>
.app-name-wrapper {
padding-left: 55px;
position: relative;
max-width:250px;
min-height:50px;
}
.app-name-wrapper .appicon {
position: absolute;
left: 0;
@@ -16,11 +10,6 @@
max-height: 45px;
margin: 0;
}
.app-name-wrapper .appname{
margin:0;
line-height:30px;
}
.app-name-wrapper .appname a{
color:#000;
font-weight:500;
@@ -58,20 +47,13 @@
text-overflow: ellipsis;
}
.tag-td-wrapper a{
color:#333;
display:inline-block;
padding:0 2px;
white-space:nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.app-info a{
color:#999;
}
.app-info .select-info{
position:absolute;
left:0;
top:10px;
display:none;
}
.checkbox-custom{
@@ -131,7 +113,7 @@
<form id="appform" name="appform" class="form-horizontal" action="{MOD_URL}" method="post">
<input type="hidden" name="appsubmit" value="true" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th >{lang application_name}</th>
<th >{lang supplier}</th>
@@ -143,14 +125,12 @@
<tr>
<td>
<a href="$value[appurl]" target="_blank" class="appicon" style="float: left;padding-right: 5px;"><img src="$value[appico]" style="margin:0" /></a>
<p class="appname">
<!--{if $value[appadminurl]}-->
<a href="$value[appadminurl]" target="_blank" >$value[appname]</a>
<!--{else}-->
<a href="$value[appurl]" target="_blank" >$value[appname]</a>
<!--{/if}-->
<small class="text-muted" title="{lang version}">$value[version]</small>
</p>
<div class="appdesc" title="$value['appdesc']"> {eval echo $value['appdesc']?$value['appdesc']:lang('none');}</div>
<!-- </div> -->
</td>

2
admin/appmarket/template/list_list_available.htm
View File

@@ -1,4 +1,4 @@
<table class="table table-striped table-hover" style="margin:0;">
<table class="table table-hover" style="margin:0;">
<thead>
<th>{lang application_name}</th>
<th>{lang group_permissions}</th>

2
admin/appmarket/template/list_list_notinstall.htm
View File

@@ -1,4 +1,4 @@
<table class="table table-striped table-hover" style="margin:0;">
<table class="table table-hover" style="margin:0;">
<thead>
<th>{lang application_name}</th>
<th>{lang group_permissions}</th>

2
admin/appmarket/template/list_list_upgrade.htm
View File

@@ -1,4 +1,4 @@
<table class="table table-striped table-hover" style="margin:0;">
<table class="table table-hover" style="margin:0;">
<thead>
<th>{lang application_name}</th>
<th>{lang group_permissions}</th>

65
admin/appmarket/template/upgrade.htm
View File

@@ -4,31 +4,18 @@
<style>
.app_upgradelist{
margin: auto;
padding: 8px;
padding: 8px 0;
border-bottom: 1px solid #f2f2f2;
position: relative;
}
.app_upgradelist .progess{
.app_upgradelist .upgrade_progess{
background-color:#dff0d8;
position: absolute;
top:0;
left: 0;
height:30px;width:0%;
height: 100%;
width:100%;
}
.app_upgradelist .progess .upgrade_progess{
background-color:#dff0d8;
position: absolute;
width:0%;
height: 100%;
}
.app-name-wrapper {
padding-left: 55px;
position: relative;
max-width:350px;
min-height:50px;
}
.app-name-wrapper .appicon {
position: absolute;
left: 0;
@@ -38,11 +25,6 @@
max-height: 45px;
margin: 0;
}
.app-name-wrapper .appname{
margin:0;
line-height:30px;
}
.app-name-wrapper .appname a{
color:#000;
font-weight:500;
@@ -73,21 +55,8 @@
margin:0;
vertical-align: text-bottom;
}
.app-info a{
color:#999;
}
.app-info .select-info{
position:absolute;
left:30px;
top:9px;
display:none;
background-color:#FFF;
padding:5px 10px;
line-height: 34px;
}
#update_selected{
margin-left:20px;
}
</style>
<!--{template common/header_simple_end}-->
@@ -101,16 +70,14 @@
<div class="bs-main-container">
<div class="all-center-top clearfix">
<div class="pull-left">
<div class="form-check">
<input class="form-check-input" type="checkbox" name="chkall" id="chkall">
<label class="form-check-label" for="seccodestatus2"><div class="app-info pull-left">
<a href="{MOD_URL}">{lang total}<span class="num">$count</span>{lang ge}{lang app}</a>
<div class="select-info">
<input class="form-check-input" type="checkbox" name="chkall" id="chkall">
<a href="{MOD_URL}">{lang total}<span class="num">$count</span>{lang ge}{lang app}</a>
<div class="app-info">
<div class="app-info select-info">
{lang selected}<span class="num">0</span>{lang ge}{lang app}
<a class="btn btn-w-md btn-round btn-primary " id="update_selected" title="{lang update_onekey}" href="javascript:;" onclick="upgrade_all();"><i class="glyphicon glyphicon-upload"></i> {lang update_onekey}</a>
</div>
</div></label>
</div>
</div>
</div>
<div class="pull-right">
<button class="btn btn-w-md btn-round btn-primary " id="update_check" title="{lang app_upgrade_check_need_update}" onclick="upgrade_check(this);" data-loading-text="{lang app_upgrade_check_need_update}">{lang app_upgrade_check_need_update2}</button>
@@ -122,25 +89,23 @@
<input type="hidden" name="formhash" value="{FORMHASH}" />
<!--{loop $list $value}-->
<div id="app_div_{$value[appid]}" class="row app_upgradelist" >
<div id="progess_{$value[appid]}" class="progess">
<div id="progess_{$value[appid]}">
<span id="upgrade_progess_{$value[appid]}" class="upgrade_progess"></span>
</div>
<div class="col-md-4 col-sm-4 col-xs-4" style="padding-left: 4px;">
<div class="checkbox-primary" style="float: left; line-height: 50px; ">
<input type="checkbox" name="del[]" value="$value[appid]" data-mid="$value[mid]">
<div class="col-md-4 col-sm-4 col-xs-4">
<div style="float: left;">
<input type="checkbox" name="del[]" class="form-check-input" value="$value[appid]" data-mid="$value[mid]">
<label></label>
</div>
<div class="app-name-wrapper" style="margin-left: 30px;">
<div class="app-name-wrapper">
{eval $appadminurl=$value[appadminurl]?$value[appadminurl]:$value[appurl]}
<a href="$appadminurl" target="_blank" class="appicon"><img src="$value[appico]" style="margin:0" /></a>
<p class="appname">
<a href="$appadminurl" target="_blank" class="">$value[appname]</a>
</p>
<div class="appdesc" title="$value['appdesc']">{eval echo $value[upgrade_version][desc_short]?$value[upgrade_version][desc_short]:lang('none');}</div>
</div>
</div>
<div class="col-md-2 col-sm-2 col-xs-2">
<p>{lang installed}:$value[version]</p>
<div>{lang installed}:$value[version]</div>
<div>{lang newest}:$value[upgrade_version][version]</div>
</div>
<div class="col-md-4 col-sm-4 col-xs-4">
@@ -153,7 +118,7 @@
</div>
</div>
<!--{/loop}-->
<table class="table table-striped table-hover">
<table class="table table-hover">
<!--{if $multi}-->
<tr>
<td colspan="20" align="center">$multi </td>

47
admin/appmarket/upgrade_app_ajax.php
View File

@@ -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;

2
admin/cloud/edit.php
View File

@@ -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){

2
admin/cloud/routeredit.php
View File

@@ -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);

2
admin/cloud/template/cloud.htm
View File

@@ -15,7 +15,7 @@
<input type="hidden" name="cloudsubmit" value="true" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<div class="table-responsive" style="margin-top: 8px;">
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<tr>
<th width="40">{lang sort}</th>

4
admin/cloud/template/edit.htm
View File

@@ -56,7 +56,7 @@
<input type="hidden" name="cloudsubmit" value="true" />
<input type="hidden" name="bz" value="$bz" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<tr>
<th width="30"></th>
@@ -188,7 +188,7 @@
<input type="hidden" name="cloudsubmit" value="true" />
<input type="hidden" name="bz" value="$bz" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<tr>
<th width="30"></th>

4
admin/cloud/template/router.htm
View File

@@ -23,7 +23,7 @@
<form id="appform" name="appform" class="form-horizontal form-horizontal-left" action="{MOD_URL}&op=router" method="post">
<input type="hidden" name="routersubmit" value="true" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th width="20">&nbsp;</th>
<th width="80">{lang priority}</th>
@@ -73,7 +73,7 @@
function checkspace(obj, routerid) {
jQuery(obj).html('<img src="admin/images/loadding.gif">');
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('<i class="icon-refresh"></i><span class="text-danger">' + json.error + '</span>');
} else {

4
admin/cloud/template/space.htm
View File

@@ -22,7 +22,7 @@
<form id="appform" name="appform" class="form-horizontal form-horizontal-left" action="{MOD_URL}&op=space" method="post" >
<input type="hidden" name="cloudsubmit" value="true" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<tr>
<th width="30">{lang sort}</th>
@@ -67,7 +67,7 @@
function checkspace(obj,remoteid){
jQuery(obj).html('<img src="admin/images/loadding.gif">');
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('<i class="glyphicon glyphicon-refresh"></i><span class="text-danger">'+json.error+'</span>');
}else{

10
admin/cloud/template/spaceadd.htm
View File

@@ -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;
}

2
admin/language/zh-cn/lang.php
View File

@@ -13,7 +13,7 @@ if(!defined('IN_DZZ')) {
$lang = array
(
'page_background'=>'登录背景',
'page_background'=>'登录页面背景',
'database_export_custom_invalid' => '您至少需要选择一个数据表进行备份',
'database_export_file_invalid' => '数据文件无法保存到服务器，请检查目录属性',
'admin_navtitle'=>'管理中心',

2
admin/login/login.php
View File

@@ -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 ? '
<div class="mb-3 has-feedback"><span class="mdi mdi-account" aria-hidden="true"></span><input class="form-control" name="admin_email" type="text" title="" onfocus="if(this.value==\'' . lang('login_email_username') . '\'){this.value=\'\'}" onblur="if(this.value==\'\'){this.value=\'' . lang('login_email_username') . '\'}" placeholder='. lang('login_email_username') . ' autocomplete="off" autofocus required/></div>' : '<div class="text-center username">' . $_G['member']['username'] . '</div><div class="text-center email">' . $_G['member']['email'] . '</div>';
$loginuser2 = $isguest ? '<div class="mb-3"><input autofocus class="form-control" id="admin_email" name="admin_email" type="text" title="" onfocus="if(this.value==\'' . lang('login_email_username') . '\'){this.value=\'\'}" placeholder='. lang('login_email_username') . ' onblur="if(this.value==\'\'){this.value=\'' . lang('login_email_username') . '\'}" autocomplete="off" required/></div>' : '<div class="relative text-center"><div class="username">' . $_G['member']['username'] . '</div><div class="email">' . $_G['member']['email'] . '</div></div>';
$sid = getglobal('sid');
$avatarstatus=getglobal('avatarstatus','member');
if(!$uid ){

4
admin/member/profileset.php
View File

@@ -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 {

10
admin/member/template/profileset.htm
View File

@@ -49,7 +49,7 @@
<form id="cpform" action="{MOD_URL}&op=profileset" method="post" name="cpform">
<input type="hidden" value="{FORMHASH}" name="formhash">
<input type="hidden" value="true" name="ordersubmit">
<table id="table-header" class="table table-striped table-hover">
<table id="table-header" class="table table-hover">
<thead>
<th width="60">{lang sort}</th>
<th width="120">{lang identifier}</th>
@@ -63,7 +63,7 @@
<!--{loop $list $fieldid $value}-->
<tr>
<td width="60"><input type="text" class="form-control input-sm" name="displayorder[$fieldid]" value="$value[displayorder]"></td>
<td width="60"><input type="text" class="form-control" name="displayorder[$fieldid]" value="$value[displayorder]"></td>
<td class="fieldid <!--{if !$value[customable]}-->gray<!--{/if}-->" width="120">$fieldid</td>
<td>$value[title] </td>
<td width="60"><input type="checkbox" class="form-check-input" name="available[$fieldid]" <!--{if $value[available]}-->checked="checked"<!--{/if}-->value="1"></td>
@@ -130,9 +130,9 @@
function addRow(obj) {
var html = '<tr class="add">' +
'<td width="60"><input type="text" class="form-control input-sm" name="add[displayorder][]" value="0" ></td>' +
'<td width="120"><input type="text" class="form-control input-sm fieldid" name="add[fieldid][]" value="" placeholder="{lang can_not_repeat}" required="true"></td>' +
'<td ><input type="text" class="form-control input-sm" name="add[title][]" value="" style="max-width:150px;" placeholder="{lang data_name}"></td>' +
'<td width="60"><input type="text" class="form-control" name="add[displayorder][]" value="0" ></td>' +
'<td width="120"><input type="text" class="form-control fieldid" name="add[fieldid][]" value="" placeholder="{lang can_not_repeat}" required="true"></td>' +
'<td ><input type="text" class="form-control" name="add[title][]" value="" style="max-width:150px;" placeholder="{lang data_name}"></td>' +
'<td width="60"><input type="checkbox" class="form-check-input" name="add[available][]" value="1"></td>' +
'<td width="60"><input type="checkbox" class="form-check-input" name="add[invisible][]" value="1"></td>' +
'<td width="60"><input type="checkbox" class="form-check-input" name="add[showincard][]" value="1"></td>' +

2
admin/member/template/verify.htm
View File

@@ -111,7 +111,7 @@
<input type="hidden" value="true" name="verifysubmit">
<input type="hidden" value="$vid" name="vid">
<input type="hidden" name="anchor" value="$anchor">
<table class="table table-striped table-hover">
<table class="table table-hover">
<!--{if $anchor!='pass'}-->
<thead>
<th width="90" style="text-align:center">{lang username}</th>

2
admin/member/template/verifyset.htm
View File

@@ -44,7 +44,7 @@
<form id="cpform" action="{MOD_URL}&op=verifyset" class="form-horizontal" method="post" name="cpform">
<input type="hidden" value="{FORMHASH}" name="formhash">
<input type="hidden" value="true" name="verifysubmit">
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th width="60">{lang enable}</th>
<th width="120">{lang authentication_code}</th>

6
admin/member/verify.php
View File

@@ -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 "<script type=\"text/javascript\">var trObj = parent.document.getElementById('mod_{$single}_row');trObj.parentNode.removeChild(trObj);</script>";
} 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'));
}
}
}

2
admin/member/verifyset.php
View File

@@ -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 {

34
admin/setting/index.php
View File

@@ -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']));

8
admin/setting/smiley.php
View File

@@ -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 = '';

2
admin/setting/template/ajax.htm
View File

@@ -29,7 +29,7 @@
</div>
<div class="modal-footer">
<div class="proper-bottom" style="position: relative;">
<div class="checkbox-custom checkbox-primary">
<div class="checkbox-custom">
<input type="checkbox" class="form-check-input" name="default" value="1" id="inputdefault" <!--{if $groupperm['default']}-->checked="checked"
<!--{/if}-->>
<label for="inputdefault"><span class="proper-span">{lang set_default_permission_group}</span></label>

30
admin/setting/template/main.htm
View File

@@ -649,28 +649,30 @@
<label class="col-sm-2" for="settingnew[loginset][background]">{lang page_background}</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="settingnew[loginset][background]" name="settingnew[loginset][background]" value="$setting[loginset][background]"/>
<span class="help-block">可以输入以('jpg', 'jpeg', 'gif', 'png')为后缀名的图片或输入网址,设置的图片或网站会同步到首页背景设置。</span>
<span class="help-block">{lang for_color_set}设置的图片或网站会同步到首页背景设置。</span>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2" for="settingnew[loginset][bcolor]">登录背景颜色</label>
<label class="col-sm-2" for="settingnew[loginset][kbcolor]">登录框背景</label>
<div class="col-sm-10">
<div class="input-group js-colorpicker mb-3 colorpicker-element" data-colorpicker-id="6">
<input type="text" class="form-control" id="settingnew[loginset][bcolor]" name="settingnew[loginset][bcolor]" value="$setting[loginset][bcolor]">
<span class="input-group-text colorpicker-input-addon" tabindex="0"><i style="background: $setting[loginset][bcolor];"></i></span>
</div>
<span class="help-block">只能输入颜色(如:#fff)</span>
<input type="text" class="form-control" id="settingnew[loginset][kbcolor]" name="settingnew[loginset][kbcolor]" value="$setting[loginset][kbcolor]">
<span class="help-block">可以为颜色(如:#FFF);图片(以.jpeg,.jpg,.png结尾)。</span>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2" for="settingnew[loginset][transparency]">登录框背景颜色</label>
<label class="col-sm-2" for="settingnew[loginset][transparency]">输入框背景颜色</label>
<div class="col-sm-10">
<div class="input-group js-colorpicker mb-3 colorpicker-element" data-colorpicker-mode="rgb" data-colorpicker-id="6">
<input type="text" id="settingnew[loginset][transparency]" class="form-control" name="settingnew[loginset][transparency]" value="$setting[loginset][transparency]">
<span class="input-group-text colorpicker-input-addon" tabindex="0"><i style="background: $setting[loginset][transparency];"></i></span>
</div>
<span class="help-block">只能输入颜色(如:rgba(8, 169, 249, 0.57))</span>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2" for="settingnew[loginset][lwaveanimation]">登录框水波动画</label>
<div class="col-sm-10">
<div class="form-check form-switch">
<input type="checkbox" name="settingnew[loginset][lwaveanimation]" id="settingnew[loginset][lwaveanimation]" class="form-check-input" <!--{if $setting[loginset][lwaveanimation]}-->checked="checked"<!--{/if}-->>
</div>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2">{lang Login template}</label>
@@ -703,10 +705,6 @@
<input class="btn btn-primary" id="submit_editsubmit" name="settingsubmit" value="{lang save_changes}" type="submit">
</dl>
</form>
<!--引入选色器css-->
<link type="text/css" rel="stylesheet" href="static/lyear/js/bootstrap-colorpicker/bootstrap-colorpicker.min.css" />
<!--引入选色器js-->
<script type="text/javascript" src="static/lyear/js/bootstrap-colorpicker/bootstrap-colorpicker.min.js"></script>
<script type="text/javascript">
jQuery(document).on('click', '.loginset-template-icon', function () {
jQuery(this).addClass('loginset-template-icon1').closest('.loginset-template').siblings().find('.loginset-template-icon').removeClass('loginset-template-icon1');
@@ -769,7 +767,7 @@
<td colspan="7" align="left"><a href="javascript:;" onclick="addSMTP(this,1)"><i class="glyphicon glyphicon-plus"></i>{lang add_SMTP_server}</a></td>
</tr>
</table>
<table id="hidden2" class="table table-striped table-hover" style="margin-bottom:0; <!--{if $setting[mail][mailsend]!=3}-->display:none<!--{/if}-->">
<table id="hidden2" class="table table-hover" style="margin-bottom:0; <!--{if $setting[mail][mailsend]!=3}-->display:none<!--{/if}-->">
<thead>{lang add_SMTP_server_set}</thead>
<!--{loop $smtps $id $smtp}-->
<tr>

2
admin/setting/template/perm_group.htm
View File

@@ -51,7 +51,7 @@
</div>
</div>
</div>
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<tr>
<th>{lang name}</th>

4
admin/setting/template/smiley.htm
View File

@@ -23,7 +23,7 @@
<form id="appform" name="appform" action="{MOD_URL}&op=smiley" method="post">
<input type="hidden" name="smileysubmit" value="true" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th width="50">&nbsp;</th>
<th>{lang sort}</th>
@@ -41,7 +41,7 @@
<td><input type="text" class="form-control " name="namenew[{$value[typeid]}]" value="$value[name]" /></td>
<td valign="middle">./static/image/smiley/{$value[directory]}</td>
<td>$value[smiliesnum] <input type="hidden" name="smiliesnum[{$value[typeid]}]" value="$value[smiliesnum]" /></td>
<td valign="middle"><a href="{ADMINSCRIPT}?mod=setting&op=smiley&operation=update&id=$value[typeid]" class="" onclick="return confirm('{lang seeting_smiley_search}')">{lang update}</a>&nbsp;&nbsp; <a href="{ADMINSCRIPT}?mod=setting&op=smiley&operation=edit&id=$value[typeid]" class="">{lang detailedness}</a></td>
<td valign="middle"><a href="{MOD_URL}&op=smiley&operation=update&id=$value[typeid]" class="" onclick="return confirm('{lang seeting_smiley_search}')">{lang update}</a>&nbsp;&nbsp; <a href="{MOD_URL}&op=smiley&operation=edit&id=$value[typeid]" class="">{lang detailedness}</a></td>
</tr>
<!--{/loop}-->
<!--{if $list_no}-->

2
admin/setting/template/smileyedit.htm
View File

@@ -36,7 +36,7 @@
<input type="hidden" name="editsubmit" value="true" />
<input type="hidden" name="id" value="$id" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th width="30">&nbsp;</th>
<th>{lang sort}</th>

8
admin/setting/template/wxsyn.htm
View File

@@ -80,10 +80,10 @@
if(!i) i = 0;
var el = jQuery(button);
if(i == 0) el.button('loading');
var url='{ADMINSCRIPT}?mod=setting&op=wxsyn&do=qiwechat_syn_org&i=' + i;
var url='{MOD_URL}&op=wxsyn&do=qiwechat_syn_org&i=' + i;
var msg = '{lang start_sync_section_weixin}';
if( j==1 ){
url='{ADMINSCRIPT}?mod=setting&op=wxsyn_down&do=qiwechat_syn_org&i=' + i;
url='{MOD_URL}&op=wxsyn_down&do=qiwechat_syn_org&i=' + i;
msg = '{lang start_sync_section_weixin_down}';
}
jQuery.getJSON(url, function(json) {
@@ -108,11 +108,11 @@
if(!i) i = 0;
var el = jQuery(button);
if(i == 0) el.button('loading');
var url='{ADMINSCRIPT}?mod=setting&op=wxsyn&do=qiwechat_syn_user&i=' + i;
var url='{MOD_URL}&op=wxsyn&do=qiwechat_syn_user&i=' + i;
var msg = '{lang synchronization_weinxin}';
var msg2 = '{lang synchronization_weinxin_success_down}';
if( j==1 ){
url='{ADMINSCRIPT}?mod=setting&op=wxsyn_down&do=qiwechat_syn_user&i=' + i;
url='{MOD_URL}&op=wxsyn_down&do=qiwechat_syn_user&i=' + i;
msg = '{lang synchronization_weinxin_down}';
msg2 = '{lang synchronization_weinxin_success_down}';
}

12
admin/system/systemupgrade.php
View File

@@ -49,7 +49,7 @@ if ($operation == 'patch' || $operation == 'cross') {
if ($_GET['ungetfrom']) {
if (md5($_GET['ungetfrom'] . $_G['config']['security']['authkey']) == $_GET['ungetfrommd5']) {
$dbreturnurl = $_G['siteurl'] . ADMINSCRIPT . '?mod=system&op=systemupgrade&operation=' . $operation . '&version=' . $version . '&step=5';
$dbreturnurl = $_G['siteurl'] . MOD_URL.'&op=systemupgrade&operation=' . $operation . '&version=' . $version . '&step=5';
$url = outputurl( $_G['siteurl'] . 'install/update.php?step=prepare&from=' . rawurlencode($dbreturnurl) . '&frommd5=' . rawurlencode(md5($dbreturnurl . $_G['config']['security']['authkey'])) );
dheader('Location: ' . $url);
} else {
@@ -102,7 +102,7 @@ if ($operation == 'patch' || $operation == 'cross') {
$updatefilelist = $dzz_upgrade -> fetch_updatefile_list($upgradeinfo);
$updatemd5filelist = $updatefilelist['md5'];
$updatefilelist = $updatefilelist['file'];
$theurl = $_G['siteurl'].ADMINSCRIPT . '?mod=system&op=systemupgrade&operation=' . $operation . '&version=' . $version . '&locale=' . $locale . '&charset=' . $charset;
$theurl = $_G['siteurl'].MOD_URL.'&op=systemupgrade&operation=' . $operation . '&version=' . $version . '&locale=' . $locale . '&charset=' . $charset;
if (empty($updatefilelist)) {
$msg = '<p style="margin:10px 0;color:red">' . lang('upgrade_download_upgradelist_error', array('upgradeurl' => upgradeinformation(-2))) . '</p>';
@@ -312,7 +312,7 @@ if ($operation == 'patch' || $operation == 'cross') {
}
$upgrade_step['step'] = 'dbupdate';
C::t('cache') -> insert(array('cachekey' => 'upgrade_step', 'cachevalue' => serialize($upgrade_step), 'dateline' => $_G['timestamp'], ), false, true);
$dbreturnurl = $_G['siteurl'] . ADMINSCRIPT . '?mod=system&op=systemupgrade&operation=' . $operation . '&version=' . $version . '&step=5';
$dbreturnurl = $_G['siteurl'] . MOD_URL.'&op=systemupgrade&operation=' . $operation . '&version=' . $version . '&step=5';
$linkurl = $_G['siteurl'] . 'install/update.php?step=prepare&from=' . rawurlencode($dbreturnurl) . '&frommd5=' . rawurlencode(md5($dbreturnurl . $_G['config']['security']['authkey']));
$msg = '<p style="margin:10px 0">' . lang('upgrade_file_successful', array('upgradeurl' => upgradeinformation(4))) . '</p>';
$msg .= '<script type="text/JavaScript">setTimeout(function(){createIframe(\'' . $linkurl . '\');}, 1000);</script>';
@@ -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;

2
admin/system/template/cron.htm
View File

@@ -110,7 +110,7 @@
<form id="cpform" action="{MOD_URL}&op=cron" class="form-horizontal form-horizontal-left" method="post" name="cpform">
<input type="hidden" value="{FORMHASH}" name="formhash">
<input type="hidden" value="true" name="cronssubmit">
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th width="45"></th>
<th style="min-width: 120px">{lang name}</th>

6
admin/system/template/database.htm
View File

@@ -63,7 +63,7 @@
<div class="row mb-3">
<label class="col-sm-2">{lang db_export_method}</label>
<div class="col-sm-10"><label class="radio radio-inline"><input type="radio" class="form-check-input" name="method" value="shell" onclick="if('0') {if(this.form.sqlcompat[2].checked==true) this.form.sqlcompat[0].checked=true; this.form.sqlcompat[2].disabled=true; this.form.sizelimit.disabled=true;} else {this.form.sqlcharset[0].checked=true; for(var i=1; i&lt;=5; i++) {if(this.form.sqlcharset[i]) this.form.sqlcharset[i].disabled=true;}}" id="method_shell">{lang db_export_shell}</label><label class="radio radio-inline"><input type="radio" class="form-check-input" name="method" value="multivol" checked="checked" onclick="this.form.sqlcompat[2].disabled=false; this.form.sizelimit.disabled=false; for(var i=1; i<=5; i++) {if(this.form.sqlcharset[i]) this.form.sqlcharset[i].disabled=false;}" id="method_multivol">{lang db_export_multivol}</label>
<input type="text" class="input-sm form-control" style="width:50px;" name="sizelimit" value="2048">
<input type="text" class="form-control" style="width:50px;" name="sizelimit" value="2048">
</div>
</div>
<div class="row mb-3">
@@ -99,7 +99,7 @@
<button type="submit" class="btn btn-primary" name="exportsubmit" value="true" >{lang blank_submit}</button>
<div class="form-check">
<input type="checkbox" class="form-check-input" value="1" onclick="document.getElementById('advanceoption').style.display = document.getElementById('advanceoption').style.display == 'none' ? '' : 'none'; this.value = this.value == 1 ? 0 : 1; this.checked = this.value == 1 ? false : true" id="btn_more">
<label class="form-check-label" for="seccodestatus2">{lang more_options}</label>
<label class="form-check-label" for="btn_more">{lang more_options}</label>
</div>
</dl>
</form>
@@ -135,7 +135,7 @@
<form id="cpform" action="{MOD_URL}&op=database&operation=import" class="form-horizontal form-horizontal-left " method="post" name="cpform">
<input type="hidden" value="{FORMHASH}" name="formhash">
<input type="hidden" value="true" name="deletesubmit">
<table class="table table-striped table-hover" style="border-top:1px solid #DDD">
<table class="table table-hover" style="border-top:1px solid #DDD">
<thead>
<th></th>
<th>{lang filename}</th>

6
admin/system/template/upgrade.htm
View File

@@ -65,7 +65,7 @@
</div>
</div>
<!--{else}-->
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th colspan="5">{lang founder_upgrade_select_version}</th>
</thead>
@@ -92,7 +92,7 @@
</div>
</div>
<!--{elseif $step==1}-->
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th colspan="5">{lang founder_upgrade_preupdatelist}</th>
</thead>
@@ -121,7 +121,7 @@
</div>
</div>
<!--{else}-->
<table class="table table-striped table-hover">
<table class="table table-hover">
<thead>
<th colspan="5">{lang founder_upgrade_diff_show}</th>
</thead>

2
admin/systemlog/template/admin.htm
View File

@@ -78,7 +78,7 @@ html, body {
</div>
<div class="row mb-3" id="hidden1">
<label class="col-sm-2">{lang logtype}</label>
<table id="systemlogtable" class="table table-striped table-hover" style="margin-bottom:0; <!--{if $_G[setting][systemlog_open]==0}-->display:none<!--{/if}-->">
<table id="systemlogtable" class="table table-hover" style="margin-bottom:0; <!--{if $_G[setting][systemlog_open]==0}-->display:none<!--{/if}-->">
<thead>
<tr>
<th>{lang logtypename}</th>