朱金勇
1aa6861445
* Fix bug #34095 .
2023-04-14 01:24:17 +00:00
朱金勇
85f42ed822
Merge branch 'fix/gh-112' into 'master'
...
* Fix security vulnerability in ping function.
See merge request easycorp/zentaopms!7409
2023-04-14 01:21:02 +00:00
Lufei
9e6711bbb2
* Fix security vulnerability in ping function.
...
The ping function previously accepted arbitrary user input and passed it to the exec function without any sanitization or validation, creating a command injection vulnerability. This commit adds input validation using filter_var to ensure that the address parameter is a valid IP address or hostname, and uses predefined command options to avoid passing user input directly to exec. Additionally, this commit simplifies the status return logic using a ternary operator.
Fix GH-112
2023-04-14 09:16:10 +08:00
liugang
8d4b6e5dcc
* Add dataview to openModules.
2023-04-14 01:10:33 +00:00
wangyidong
c5681e0433
* code for issue #767 .
2023-04-14 09:10:00 +08:00
liugang
566a3e69f9
* Sort sqls to upgrade privileges.
2023-04-14 01:05:30 +00:00
liugang
99acc957a6
* Remove collate property.
2023-04-14 01:04:22 +00:00
王怡栋
78aded1bcc
Merge branch 'dev/gfl_zentaopms_305' into 'master'
...
- Delete code for crumbs in docDetail .
See merge request easycorp/zentaopms!7406
2023-04-14 00:52:09 +00:00
guofeilong
b7893e356d
- Delete js and view code for crumbs in docDetail .
2023-04-14 08:40:47 +08:00
guofeilong
8ab8e71215
- Delete code for crumbs in docDetail .
2023-04-14 08:38:27 +08:00
朱金勇
f337008374
* Fix bug #34079 .
2023-04-13 17:36:02 +00:00
朱金勇
267035c94c
* Fix install for dmdb.
2023-04-13 17:24:29 +00:00
朱金勇
9e5757ee64
* Split create unique index.
2023-04-13 16:51:48 +00:00
liugang
9132411a03
* Sort privileges when upgrade.
2023-04-13 09:49:28 +00:00
孙广明
d9c8fdd365
Merge branch 'sprint/scx_addinitpicker' into 'master'
...
* Add init picker.
See merge request easycorp/zentaopms!7405
2023-04-13 09:19:57 +00:00
宋辰轩
2f7ed8959f
* Add init picker.
2023-04-13 17:16:18 +08:00
wangyidong
da5a823a86
* code for issue #773 .
2023-04-13 17:15:15 +08:00
朱金勇
a3cb0ae8f6
Merge branch 'revert-b38b7e99' into 'master'
...
Revert "Merge branch 'session' into 'master'"
See merge request easycorp/zentaopms!7404
2023-04-13 09:08:32 +00:00
wangyidong
2c8af4f674
Merge branch 'tsj_task'
2023-04-13 17:03:34 +08:00
王怡栋
e6be417612
Merge branch 'master' into 'tsj_task'
...
# Conflicts:
# module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
tianshujie
e5bcb8b2f9
* The ID of the last accessed object is retained.
2023-04-13 16:58:25 +08:00
王怡栋
ac0347ae6c
Merge branch 'dev/gfl_zentaopms_305' into 'master'
...
Dev/gfl zentaopms 305
See merge request easycorp/zentaopms!7402
2023-04-13 08:58:07 +00:00
guofeilong
60499b8226
* Adjust code for css in doc/index .
2023-04-13 16:56:28 +08:00
guofeilong
c7bd3087d2
* Add position to focus input .
2023-04-13 16:56:13 +08:00
guofeilong
0991e685b1
* Code for add scroll func to lefttree while add child .
2023-04-13 16:56:13 +08:00
鲁飞
5e5c93fbd8
Revert "Merge branch 'session' into 'master'"
...
This reverts merge request !7395
2023-04-13 08:55:06 +00:00
tianshujie
8d97ca43a5
* Resolve issue #768 .
2023-04-13 16:44:31 +08:00
tianshujie
adcaacc46d
* Document processing permission.
2023-04-13 16:40:46 +08:00
tianshujie
d2782dc46a
* Resolve issue #775 .
2023-04-13 16:37:20 +08:00
tianshujie
e279e91070
* Resolve issue #775 .
2023-04-13 16:22:45 +08:00
wangyidong
ad6e538eca
* code for issue #772 .
2023-04-13 16:17:21 +08:00
wangyidong
17ce13af75
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
2023-04-13 16:01:05 +08:00
wangyidong
8a69021d9b
* code for issue #776 .
2023-04-13 16:00:40 +08:00
tianshujie
ee0f443ee4
* Resolve issue #763 .
2023-04-13 15:51:36 +08:00
tianshujie
0c935c7eea
* Modify jump link.
2023-04-13 15:45:51 +08:00
朱金勇
6e3b635868
* Add default value for zt_workflowaction.
2023-04-13 07:36:12 +00:00
朱金勇
b38b7e992e
Merge branch 'session' into 'master'
...
* Fix typo.
See merge request easycorp/zentaopms!7395
2023-04-13 06:09:07 +00:00
朱金勇
6dcf3bc19e
* Add default value for workflow.
2023-04-13 05:48:38 +00:00
孙广明
adb2477a71
Merge branch 'pipeline_jenkins_ly' into 'master'
...
- Delete gitlab runner yaml file and adjust Jenkinsfile.
See merge request easycorp/zentaopms!7400
2023-04-13 05:32:47 +00:00
wangyidong
eab4c77775
Merge branch 'cyy_fixbug'
2023-04-13 13:30:55 +08:00
王怡栋
5ac6adcb09
Merge branch 'master' into 'cyy_fixbug'
...
# Conflicts:
# module/doc/view/lefttree.html.php
2023-04-13 05:30:11 +00:00
liyang
e8b2a9bbb1
- Delete gitlab runner yaml file and adjust Jenkinsfile.
2023-04-13 13:29:15 +08:00
王怡栋
7dcfba812e
Merge branch 'dev/gfl_zentaopms_305' into 'master'
...
* Code for task 90776 .
See merge request easycorp/zentaopms!7396
2023-04-13 05:28:57 +00:00
朱金勇
030da6729d
* Fix bug#34112.
2023-04-13 05:28:37 +00:00
guofeilong
052751d7ad
* Code for task #90777 .
2023-04-13 13:27:03 +08:00
guofeilong
b73c301143
* Code for task 90776 .
2023-04-13 13:27:03 +08:00
刘刚
ff16a13233
Merge branch 'screen_filter' into 'master'
...
* Update go-view dist.
See merge request easycorp/zentaopms!7399
2023-04-13 05:26:50 +00:00
刘刚
37acca3d5f
Merge branch 'daitingting_task_#34006' into 'master'
...
* Fix bug #34006 .
See merge request easycorp/zentaopms!7398
2023-04-13 05:26:33 +00:00
qixinzhi
e5ba059a33
* Update go-view dist.
2023-04-13 13:21:44 +08:00
caoyanyi
5c39e492be
* Add form tips, Fix bug #33541 .
2023-04-13 13:19:15 +08:00
朱金勇