WindyMadman/dzzoffice
1
0
Fork 0
mirror of https://github.com/zyx0814/dzzoffice.git synced 2025-01-07 03:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新内容： (#255)

Browse Source 
修复编辑文件夹权限时文件夹权限名称与文件夹名重合问题
修改单选框、复选框样式
当站点关闭时不能进行找回密码
修改未授权用户能调用组织部门信息问题
修复PC端分享页面缺少_hotkey.js文件问题
修复应用市场标识错误问题
This commit is contained in:
小胡 2024-10-10 14:39:27 +08:00 committed by GitHub
parent edd8037981
commit 7701c1b752
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/appmarket/cp.php
View File

@ -70,6 +70,7 @@ if ($do == 'export') {//应用导出
}
elseif ($do == 'import') {//导入应用
$navtitle=lang('import_type_app').' - '.lang('appname');
if (!submitcheck('importsubmit')) {
include template('import');
} else {
@ -96,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'));
}
}
}
@ -211,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_URL;
if (!empty($filename) && preg_match('/^[\w\.]+$/', $filename)) {
$filename = DZZ_ROOT . './'.$dir.'/' . $appname . '/' . $filename;
if (file_exists($filename)) {
@ -227,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'));
}
}
@ -238,8 +239,8 @@ elseif ($do == 'uninstall') {//卸载应用
}
$app['extra'] = unserialize($app['extra']);
$finish = FALSE;
$request_uri = ADMINSCRIPT . '?mod=app';
$refer = $_GET['refer'];
$request_uri = MOD_URL;
$refer = $_GET['refer'];
$appinfo=$app;
$msg='';
if ($app['identifier']) {
@ -276,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') {//卸载应用
@ -319,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'));
}
}

2
admin/appmarket/default.php
View File

@ -61,7 +61,7 @@ $keyword = trim($_GET['keyword']);
$page = empty($_GET['page']) ? 1 : intval($_GET['page']);
$perpage = 20;
$gets = array('mod' => 'app', 'op' => 'default', 'keyword' => $keyword, 'depid' => $depid, 'group' => $group, 'position' => $position, );
$gets = array('mod' => MOD_NAME, 'op' => 'default', 'keyword' => $keyword, 'depid' => $depid, 'group' => $group, 'position' => $position, );
$theurl = BASESCRIPT . "?" . url_implode($gets);
$refer = urlencode($theurl . '&page=' . $page);

4
admin/appmarket/import.php
View File

@ -12,10 +12,10 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) {
include libfile('function/admin');
include libfile('function/organization');
$do = empty($_GET['do']) ? 'available' : trim($_GET['do']);
$navtitle=lang('import_type_app').' - '.lang('appname');
$page = empty($_GET['page']) ? 1 : intval($_GET['page']);
$perpage = 20;
$gets = array('mod' => 'app', 'op' => 'import', 'do' => $do, );
$gets = array('mod' => MOD_NAME, 'op' => 'import', 'do' => $do, );
$theurl = BASESCRIPT . "?" . url_implode($gets);
$refer = urlencode($theurl . '&page=' . $page);

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_URL . '&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'];

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

@ -27,10 +27,10 @@
<td>$value[identifier]</td>
<td>$value[vendor]</td>
<td>
<a class="btn btn-link" href="{BASESCRIPT}?mod=app&op=edit&do=edit&appid=$value[appid]&refer=$refer" title="{lang edit}"><i class="glyphicon glyphicon-edit"></i></a>
<a class="btn btn-link" href="{BASESCRIPT}?mod=app&op=cp&do=enable&appid=$value[appid]&refer=$refer" title="{lang enable}"><i class="glyphicon glyphicon-ok-circle"></i></a>
<a class="btn btn-link" href="{BASESCRIPT}?mod=app&op=cp&do=export&appid=$value[appid]&refer=$refer" title="{lang export}"><i class="glyphicon glyphicon-export"></i></a>
<a class="btn btn-link text-danger" style="color:#e83110" href="{BASESCRIPT}?mod=app&op=cp&do=uninstall&appid=$value[appid]&refer=$refer" title="{lang uninstall}" onclick="if(confirm('{lang list_uninstall_application}'))return true;else return false"><i class="glyphicon glyphicon-remove-circle"></i></a>
<a class="btn btn-link" href="{MOD_URL}&op=edit&do=edit&appid=$value[appid]&refer=$refer" title="{lang edit}"><i class="glyphicon glyphicon-edit"></i></a>
<a class="btn btn-link" href="{MOD_URL}&op=cp&do=enable&appid=$value[appid]&refer=$refer" title="{lang enable}"><i class="glyphicon glyphicon-ok-circle"></i></a>
<a class="btn btn-link" href="{MOD_URL}&op=cp&do=export&appid=$value[appid]&refer=$refer" title="{lang export}"><i class="glyphicon glyphicon-export"></i></a>
<a class="btn btn-link text-danger" style="color:#e83110" href="{MOD_URL}&op=cp&do=uninstall&appid=$value[appid]&refer=$refer" title="{lang uninstall}" onclick="if(confirm('{lang list_uninstall_application}'))return true;else return false"><i class="glyphicon glyphicon-remove-circle"></i></a>
</td>
</tr>
<!--{/loop}-->

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

@ -18,7 +18,7 @@
<td>$value[identifier]</td>
<td>$value[vendor]</td>
<td>
<a class="btn btn-link" href="{BASESCRIPT}?mod=app&op=cp&do=upgrade&appid=$value[appid]&refer=$refer" title="{lang nav_db_runquery}">{lang nav_db_runquery}</a>
<a class="btn btn-link" href="{MOD_URL}&op=cp&do=upgrade&appid=$value[appid]&refer=$refer" title="{lang nav_db_runquery}">{lang nav_db_runquery}</a>
</td>
</tr>
<!--{/loop}-->

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

@ -7,16 +7,12 @@
<h4 class="modal-title">{lang edit_folder_permissions}</h4>
</div>
<div class="modal-body group-top">
<div class="input-black input-float col-md-12 clearfix">
<label class="control-label input-label">
<div class="col-md-12 clearfix">
<label class="control-label input-label">
{lang folder_permission_name}
</label>
<div class="input-animate">
<input type="text" class="form-control"
name="pername" value="$groupperm[pername]"/>
</div>
<input type="text" class="form-control" name="pername" value="$groupperm[pername]"/>
</div>
<div class="select-p clearfix">
<p class="select-perm ">{lang choose_permission}：</p>
<ul class="select-properties col-lg-12 col-md-12 col-sm-12 col-xs-12">

2
core/class/table/table_resources.php
View File

@ -890,7 +890,7 @@ class table_resources extends dzz_table
$fileinfo['isgroup'] = ($currentfolder['flag'] == 'organization') ? true : false;
}
} elseif ($fileinfo['ext']) {
$fileinfo['type'] = $fileinfo['ext'] . lang('typename_folder');
$fileinfo['type'] = getFileTypeName($fileinfo['type'], $fileinfo['ext']);
} else {
$fileinfo['type'] = lang('undefined_file_type');
}

1
dzz/system/orgtree.php
View File

@ -10,6 +10,7 @@
if(!defined('IN_DZZ')) {
exit('Access Denied');
}
Hook::listen('check_login');
include_once libfile('function/organization');
$ismobile=helper_browser::ismobile();
$uid =isset($_GET['uid'])?intval($_GET['uid']):$_G['uid'];

4
user/login/logging/getpasswd.php
View File

@ -12,7 +12,9 @@ if(!defined('IN_DZZ')) {
}
define('NOROBOT', TRUE);
if($_G['setting']['bbclosed']) {
dheader("Location: user.php?mod=login");
}
if($_GET['uid'] && $_GET['id']) {
$dzz_action = 141;