diff --git a/COPYING b/COPYING index b3484e3a6a..eedc91483b 100644 --- a/COPYING +++ b/COPYING @@ -1,11 +1,6 @@ -本仓库的源代码由以下双重许可涵盖： - (1) Z PUBLIC LICENSE(以下简称ZPL) v1.2。 - (2) Affero General Public License(以下简称AGPL) 授权协议。 -默认授权协议为ZPL协议。 -您也可以选择遵守AGPL协议使用我们的源代码。 +The source code of zentao is covered by the following dual licenses: -The source code of this repository is covered by the following dual licenses： -(1) Z PUBLIC LICENSE(ZPL) v1.2 -(2) Affero General Public License(AGPL) -The default license agreement is the ZPL. -Or you can choose to use our source code under the AGPL. +(1) ZPL 1.2: http://zpl.pub/page/zplv12.html +(2) AGPL 3.0: https://www.gnu.org/licenses/agpl-3.0.en.html + +You can choose ZPL or AGPL to use zentao. diff --git a/Makefile b/Makefile index 9e8da19a96..e747c93624 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ clean: rm -fr zentaoxx rm -fr tmp/ rm -f *.sh + rm -f *.deb *.rpm common: mkdir zentaopms cp -fr api zentaopms/ @@ -176,7 +177,7 @@ deb: cp ZenTaoPMS.${VERSION}.zip buildroot/opt cd buildroot/opt; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms zentao; rm ZenTaoPMS.${VERSION}.zip sed -i 's/index.php/\/zentao\/index.php/' buildroot/opt/zentao/www/.htaccess - sudo dpkg -b buildroot/ ZenTaoPMS_${VERSION}_1_all.deb + sudo dpkg -b buildroot/ ZenTaoPMS.${VERSION}.1.all.deb rm -rf buildroot rpm: mkdir ~/rpmbuild/SPECS -p @@ -252,6 +253,9 @@ ciCommon: rm -fr zentaopms zentaoxx zentaoxx.*.zip make en rm -fr zentaopms zentaoxx zentaoxx.*.zip + rm -f $(BUILD_PATH)/ZenTao*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION).int.zip + cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) + cp ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH) ci: make ciCommon php tools/packZip.php $(VERSION) @@ -263,12 +267,7 @@ ci: php tools/packRpm.php $(VERSION) sh rpm.sh rm -rf tmp/ - rm -f zentaobiz*.zip zentaomax*.zip $(BUILD_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm *.sh - cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) - mv *.zip *.deb *.rpm $(RELEASE_PATH) -lite: - make ciCommon - php tools/packZip.php $(VERSION) $(LITEVERSION) - rm -f zentaobiz*.zip zentaomax*.zip $(BUILD_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoALM.$(LITEVERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(LITEVERSION)*.zip *.sh - cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) - mv *.zip $(RELEASE_PATH) + rm -f zentaobiz*.zip zentaomax*.zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm *.sh $(RELEASE_PATH)/pmsPack/*.zip $(RELEASE_PATH)/pmsPack/deb/* $(RELEASE_PATH)/pmsPack/rpm/* + mv ZenTaoALM.$(VERSION).int.php*.zip ZenTaoPMS.$(VERSION).php*.zip $(RELEASE_PATH)/pmsPack + mv *.deb $(RELEASE_PATH)/pmsPack/deb + mv *.rpm $(RELEASE_PATH)/pmsPack/rpm diff --git a/api/v1/entries/bug.php b/api/v1/entries/bug.php index 8b770710a2..94bf3dfe55 100644 --- a/api/v1/entries/bug.php +++ b/api/v1/entries/bug.php @@ -3,7 +3,7 @@ * The bug entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugactive.php b/api/v1/entries/bugactive.php index 4f2f69b86b..19ba5e51fc 100644 --- a/api/v1/entries/bugactive.php +++ b/api/v1/entries/bugactive.php @@ -3,7 +3,7 @@ * The bug active entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugassign.php b/api/v1/entries/bugassign.php index 3b505d0a12..bd5bcfb434 100644 --- a/api/v1/entries/bugassign.php +++ b/api/v1/entries/bugassign.php @@ -3,7 +3,7 @@ * The bug assign entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugclose.php b/api/v1/entries/bugclose.php index 4a95bbda36..58a595c184 100644 --- a/api/v1/entries/bugclose.php +++ b/api/v1/entries/bugclose.php @@ -3,7 +3,7 @@ * The bug close entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugconfirm.php b/api/v1/entries/bugconfirm.php index 20d8f3f1e3..d677486156 100644 --- a/api/v1/entries/bugconfirm.php +++ b/api/v1/entries/bugconfirm.php @@ -3,7 +3,7 @@ * The bug confirm entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugrecordestimate.php b/api/v1/entries/bugrecordestimate.php index 60f9723958..2debf19d08 100644 --- a/api/v1/entries/bugrecordestimate.php +++ b/api/v1/entries/bugrecordestimate.php @@ -3,7 +3,7 @@ * The bug recordEstimate entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugresolve.php b/api/v1/entries/bugresolve.php index 9526b47f0e..09243a2163 100644 --- a/api/v1/entries/bugresolve.php +++ b/api/v1/entries/bugresolve.php @@ -3,7 +3,7 @@ * The bug resolve entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/bugs.php b/api/v1/entries/bugs.php index 4694e85145..e07502a219 100644 --- a/api/v1/entries/bugs.php +++ b/api/v1/entries/bugs.php @@ -3,7 +3,7 @@ * The bugs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/build.php b/api/v1/entries/build.php index fc3e7fed5a..6d984a44be 100644 --- a/api/v1/entries/build.php +++ b/api/v1/entries/build.php @@ -3,7 +3,7 @@ * The build entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/builds.php b/api/v1/entries/builds.php index e303c9a4e1..1157014715 100644 --- a/api/v1/entries/builds.php +++ b/api/v1/entries/builds.php @@ -3,7 +3,7 @@ * The builds entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/ciresults.php b/api/v1/entries/ciresults.php index 12cbc5d82b..dce88c8ec8 100644 --- a/api/v1/entries/ciresults.php +++ b/api/v1/entries/ciresults.php @@ -3,7 +3,7 @@ * The ciresults entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/config.php b/api/v1/entries/config.php index 5c370b8db5..88ae406ae2 100644 --- a/api/v1/entries/config.php +++ b/api/v1/entries/config.php @@ -3,7 +3,7 @@ * The config entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/configs.php b/api/v1/entries/configs.php index f9df6375fe..923cc9ab74 100644 --- a/api/v1/entries/configs.php +++ b/api/v1/entries/configs.php @@ -3,7 +3,7 @@ * The configs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/department.php b/api/v1/entries/department.php index 774bef0363..3f9d9e68d8 100644 --- a/api/v1/entries/department.php +++ b/api/v1/entries/department.php @@ -3,7 +3,7 @@ * The department entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/departments.php b/api/v1/entries/departments.php index c03b4f8b30..df22fabfb0 100644 --- a/api/v1/entries/departments.php +++ b/api/v1/entries/departments.php @@ -3,7 +3,7 @@ * The departments entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/doc.php b/api/v1/entries/doc.php index fcedf4ebe7..5a45d03634 100644 --- a/api/v1/entries/doc.php +++ b/api/v1/entries/doc.php @@ -3,7 +3,7 @@ * The doc entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/doclibs.php b/api/v1/entries/doclibs.php index f9131fe3b7..6598d6cb8e 100644 --- a/api/v1/entries/doclibs.php +++ b/api/v1/entries/doclibs.php @@ -3,7 +3,7 @@ * The doclibs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/docs.php b/api/v1/entries/docs.php index 86453efe5d..ec0783d9ce 100644 --- a/api/v1/entries/docs.php +++ b/api/v1/entries/docs.php @@ -3,7 +3,7 @@ * The docs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/error.php b/api/v1/entries/error.php index f242886439..dbe9c3c760 100644 --- a/api/v1/entries/error.php +++ b/api/v1/entries/error.php @@ -3,7 +3,7 @@ * The error entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/execution.php b/api/v1/entries/execution.php index fcd380534b..cc9add74e9 100644 --- a/api/v1/entries/execution.php +++ b/api/v1/entries/execution.php @@ -3,7 +3,7 @@ * The execution entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/executionbugs.php b/api/v1/entries/executionbugs.php index 026f8d6bda..5b7cf62535 100644 --- a/api/v1/entries/executionbugs.php +++ b/api/v1/entries/executionbugs.php @@ -3,7 +3,7 @@ * The execution bugs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/executionbuilds.php b/api/v1/entries/executionbuilds.php index 97ddd77f62..979983c172 100644 --- a/api/v1/entries/executionbuilds.php +++ b/api/v1/entries/executionbuilds.php @@ -3,7 +3,7 @@ * The execution builds entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/executioncases.php b/api/v1/entries/executioncases.php index be10d28b97..3b63e30e3a 100644 --- a/api/v1/entries/executioncases.php +++ b/api/v1/entries/executioncases.php @@ -3,7 +3,7 @@ * The execution cases entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/executions.php b/api/v1/entries/executions.php index 630f9db4bb..9a00ae719b 100644 --- a/api/v1/entries/executions.php +++ b/api/v1/entries/executions.php @@ -3,7 +3,7 @@ * The executions entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/executionstories.php b/api/v1/entries/executionstories.php index 2c16ac7dd2..df57bf5cbc 100644 --- a/api/v1/entries/executionstories.php +++ b/api/v1/entries/executionstories.php @@ -3,7 +3,7 @@ * The execution entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version 1 diff --git a/api/v1/entries/feedback.php b/api/v1/entries/feedback.php index a53b5220a1..05daaa3624 100644 --- a/api/v1/entries/feedback.php +++ b/api/v1/entries/feedback.php @@ -3,7 +3,7 @@ * The product entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/feedbackassignto.php b/api/v1/entries/feedbackassignto.php index 037b7b12d3..2ec87bf1fd 100644 --- a/api/v1/entries/feedbackassignto.php +++ b/api/v1/entries/feedbackassignto.php @@ -3,7 +3,7 @@ * The feedback assignto entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/feedbackclose.php b/api/v1/entries/feedbackclose.php index 315223f0a3..65f0f49554 100644 --- a/api/v1/entries/feedbackclose.php +++ b/api/v1/entries/feedbackclose.php @@ -3,7 +3,7 @@ * The feedback close entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/feedbacks.php b/api/v1/entries/feedbacks.php index 92e58c9ece..af4d515801 100644 --- a/api/v1/entries/feedbacks.php +++ b/api/v1/entries/feedbacks.php @@ -3,7 +3,7 @@ * The executions entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/file.php b/api/v1/entries/file.php index 833739c02a..6c1b27e370 100644 --- a/api/v1/entries/file.php +++ b/api/v1/entries/file.php @@ -3,7 +3,7 @@ * The file entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/files.php b/api/v1/entries/files.php index fb78caa8a1..61ffcf16a0 100644 --- a/api/v1/entries/files.php +++ b/api/v1/entries/files.php @@ -3,7 +3,7 @@ * The files entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/gitlabwebhook.php b/api/v1/entries/gitlabwebhook.php index 148a679abd..bd016bbd07 100644 --- a/api/v1/entries/gitlabwebhook.php +++ b/api/v1/entries/gitlabwebhook.php @@ -3,7 +3,7 @@ * The repo entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author xiawenlong * @package repo * @version 1 diff --git a/api/v1/entries/groups.php b/api/v1/entries/groups.php index 48e5729431..556a853b48 100644 --- a/api/v1/entries/groups.php +++ b/api/v1/entries/groups.php @@ -3,7 +3,7 @@ * The groups entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/issue.php b/api/v1/entries/issue.php index 211b43a1b5..9bf28b1fc1 100644 --- a/api/v1/entries/issue.php +++ b/api/v1/entries/issue.php @@ -3,7 +3,7 @@ * The issue entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/issues.php b/api/v1/entries/issues.php index 444dc2e0b5..c8c8084917 100644 --- a/api/v1/entries/issues.php +++ b/api/v1/entries/issues.php @@ -3,7 +3,7 @@ * The issues entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/langs.php b/api/v1/entries/langs.php index 2add7ff10e..28abf28db6 100644 --- a/api/v1/entries/langs.php +++ b/api/v1/entries/langs.php @@ -3,7 +3,7 @@ * The langs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/meetings.php b/api/v1/entries/meetings.php index 6466ded6a0..d1c3eabb35 100644 --- a/api/v1/entries/meetings.php +++ b/api/v1/entries/meetings.php @@ -3,7 +3,7 @@ * The meetings entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/modules.php b/api/v1/entries/modules.php index f38e90383a..7b28a00ed6 100644 --- a/api/v1/entries/modules.php +++ b/api/v1/entries/modules.php @@ -3,7 +3,7 @@ * The modules entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/options.php b/api/v1/entries/options.php index 651ebd7d7b..beafd6f5ed 100644 --- a/api/v1/entries/options.php +++ b/api/v1/entries/options.php @@ -3,7 +3,7 @@ * The options entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/ping.php b/api/v1/entries/ping.php index 1b27d54262..bf4bff6cb0 100644 --- a/api/v1/entries/ping.php +++ b/api/v1/entries/ping.php @@ -3,7 +3,7 @@ * The ping entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/product.php b/api/v1/entries/product.php index ae8f4e374b..518936c737 100644 --- a/api/v1/entries/product.php +++ b/api/v1/entries/product.php @@ -3,7 +3,7 @@ * The product entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productissue.php b/api/v1/entries/productissue.php index ed999bd2bd..176a92ed7f 100644 --- a/api/v1/entries/productissue.php +++ b/api/v1/entries/productissue.php @@ -4,7 +4,7 @@ * It is only used by Gitlab. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productissues.php b/api/v1/entries/productissues.php index f63e2e04e3..474a61c5c2 100644 --- a/api/v1/entries/productissues.php +++ b/api/v1/entries/productissues.php @@ -4,7 +4,7 @@ * It is only used by Gitlab. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productplan.php b/api/v1/entries/productplan.php index 87b2588011..342006755f 100644 --- a/api/v1/entries/productplan.php +++ b/api/v1/entries/productplan.php @@ -3,7 +3,7 @@ * The productplan entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productplanlinkbugs.php b/api/v1/entries/productplanlinkbugs.php index 33f6f7812d..fe19ed92f2 100644 --- a/api/v1/entries/productplanlinkbugs.php +++ b/api/v1/entries/productplanlinkbugs.php @@ -3,7 +3,7 @@ * The productplanlinkbugs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productplanlinkstories.php b/api/v1/entries/productplanlinkstories.php index 2f34d21df9..2d82f4fb74 100644 --- a/api/v1/entries/productplanlinkstories.php +++ b/api/v1/entries/productplanlinkstories.php @@ -3,7 +3,7 @@ * The productplanlinkstories entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productplans.php b/api/v1/entries/productplans.php index f56cf3ae96..f8313c1683 100644 --- a/api/v1/entries/productplans.php +++ b/api/v1/entries/productplans.php @@ -3,7 +3,7 @@ * The productplans entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productplanunlinkbugs.php b/api/v1/entries/productplanunlinkbugs.php index 31db16064e..0bbbf4783c 100644 --- a/api/v1/entries/productplanunlinkbugs.php +++ b/api/v1/entries/productplanunlinkbugs.php @@ -3,7 +3,7 @@ * The productplanunlinkbugs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productplanunlinkstories.php b/api/v1/entries/productplanunlinkstories.php index 4f77dee06c..47ec3f6719 100644 --- a/api/v1/entries/productplanunlinkstories.php +++ b/api/v1/entries/productplanunlinkstories.php @@ -3,7 +3,7 @@ * The productplanunlinkstories entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/productprojects.php b/api/v1/entries/productprojects.php index 8826d1a5bd..b493ed3fcd 100644 --- a/api/v1/entries/productprojects.php +++ b/api/v1/entries/productprojects.php @@ -3,7 +3,7 @@ * The product projects entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/products.php b/api/v1/entries/products.php index 1763eef7cc..efce3d727f 100644 --- a/api/v1/entries/products.php +++ b/api/v1/entries/products.php @@ -3,7 +3,7 @@ * The products entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/program.php b/api/v1/entries/program.php index d42ed1a9fe..22a9469687 100644 --- a/api/v1/entries/program.php +++ b/api/v1/entries/program.php @@ -3,7 +3,7 @@ * The program entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/programs.php b/api/v1/entries/programs.php index 10629532c2..1eccac99f3 100644 --- a/api/v1/entries/programs.php +++ b/api/v1/entries/programs.php @@ -3,7 +3,7 @@ * The programs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/project.php b/api/v1/entries/project.php index 61b8cf819a..6665b28b5e 100644 --- a/api/v1/entries/project.php +++ b/api/v1/entries/project.php @@ -3,7 +3,7 @@ * The project entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/projectbugs.php b/api/v1/entries/projectbugs.php index 8ee1827387..b5c6660c5c 100644 --- a/api/v1/entries/projectbugs.php +++ b/api/v1/entries/projectbugs.php @@ -3,7 +3,7 @@ * The project bugs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/projectcases.php b/api/v1/entries/projectcases.php index d237ce1b6e..948300ff2a 100644 --- a/api/v1/entries/projectcases.php +++ b/api/v1/entries/projectcases.php @@ -3,7 +3,7 @@ * The project cases entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/projectreleases.php b/api/v1/entries/projectreleases.php index c124bbb94a..21c9eb3b73 100644 --- a/api/v1/entries/projectreleases.php +++ b/api/v1/entries/projectreleases.php @@ -3,7 +3,7 @@ * The projectreleases entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/projects.php b/api/v1/entries/projects.php index a4a6819daa..53a8658c86 100644 --- a/api/v1/entries/projects.php +++ b/api/v1/entries/projects.php @@ -3,7 +3,7 @@ * The project entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/projectstories.php b/api/v1/entries/projectstories.php index be44915f19..893e059284 100644 --- a/api/v1/entries/projectstories.php +++ b/api/v1/entries/projectstories.php @@ -3,7 +3,7 @@ * The project entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version 1 diff --git a/api/v1/entries/release.php b/api/v1/entries/release.php index 41ab4c6661..e2215ecc9e 100644 --- a/api/v1/entries/release.php +++ b/api/v1/entries/release.php @@ -3,7 +3,7 @@ * The release entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/releases.php b/api/v1/entries/releases.php index e56e1742b6..5a451e1775 100644 --- a/api/v1/entries/releases.php +++ b/api/v1/entries/releases.php @@ -3,7 +3,7 @@ * The productplans entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/reports.php b/api/v1/entries/reports.php index d55f98932b..4f7d14a273 100644 --- a/api/v1/entries/reports.php +++ b/api/v1/entries/reports.php @@ -3,7 +3,7 @@ * The reports entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/reporules.php b/api/v1/entries/reporules.php index 693d9ce90c..eb363c7ef2 100644 --- a/api/v1/entries/reporules.php +++ b/api/v1/entries/reporules.php @@ -3,7 +3,7 @@ * The reporules entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package entries * @version 1 diff --git a/api/v1/entries/repos.php b/api/v1/entries/repos.php index a45c974513..2260840373 100644 --- a/api/v1/entries/repos.php +++ b/api/v1/entries/repos.php @@ -3,7 +3,7 @@ * The repos entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/risk.php b/api/v1/entries/risk.php index 89ed1a1b2c..d7148e7d60 100644 --- a/api/v1/entries/risk.php +++ b/api/v1/entries/risk.php @@ -3,7 +3,7 @@ * The risk entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/risks.php b/api/v1/entries/risks.php index a18ef97f88..c0fb7f455a 100644 --- a/api/v1/entries/risks.php +++ b/api/v1/entries/risks.php @@ -3,7 +3,7 @@ * The risks entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/stakeholders.php b/api/v1/entries/stakeholders.php index fe57064421..75142bc510 100644 --- a/api/v1/entries/stakeholders.php +++ b/api/v1/entries/stakeholders.php @@ -3,7 +3,7 @@ * The stakeholder entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/stories.php b/api/v1/entries/stories.php index 1e95c50e69..87128c60b8 100644 --- a/api/v1/entries/stories.php +++ b/api/v1/entries/stories.php @@ -3,7 +3,7 @@ * The stories entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/story.php b/api/v1/entries/story.php index 08f6e1bcf9..b76c53c8d8 100644 --- a/api/v1/entries/story.php +++ b/api/v1/entries/story.php @@ -3,7 +3,7 @@ * The story entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storyactive.php b/api/v1/entries/storyactive.php index 59c86d27a4..ba2c1d7d7d 100644 --- a/api/v1/entries/storyactive.php +++ b/api/v1/entries/storyactive.php @@ -3,7 +3,7 @@ * The bug change point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storyassignto.php b/api/v1/entries/storyassignto.php index e101cb17e1..e31a8d9353 100644 --- a/api/v1/entries/storyassignto.php +++ b/api/v1/entries/storyassignto.php @@ -3,7 +3,7 @@ * The story assignto entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storychange.php b/api/v1/entries/storychange.php index a9751265d5..9e9b2fb7d8 100644 --- a/api/v1/entries/storychange.php +++ b/api/v1/entries/storychange.php @@ -3,7 +3,7 @@ * The bug change point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storyclose.php b/api/v1/entries/storyclose.php index 4d4141b88a..7c81880bc8 100644 --- a/api/v1/entries/storyclose.php +++ b/api/v1/entries/storyclose.php @@ -3,7 +3,7 @@ * The story close entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storyrecall.php b/api/v1/entries/storyrecall.php index 99e06cc210..ae78775f91 100644 --- a/api/v1/entries/storyrecall.php +++ b/api/v1/entries/storyrecall.php @@ -3,7 +3,7 @@ * The story recall entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storyrecordestimate.php b/api/v1/entries/storyrecordestimate.php index bb4a86197b..42a65e75c2 100644 --- a/api/v1/entries/storyrecordestimate.php +++ b/api/v1/entries/storyrecordestimate.php @@ -3,7 +3,7 @@ * The story recordEstimate entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/storyreview.php b/api/v1/entries/storyreview.php index d2bbef826d..b1c8f5d3ff 100644 --- a/api/v1/entries/storyreview.php +++ b/api/v1/entries/storyreview.php @@ -3,7 +3,7 @@ * The story review of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/tabs.php b/api/v1/entries/tabs.php index 162293dcb3..9078299d8c 100644 --- a/api/v1/entries/tabs.php +++ b/api/v1/entries/tabs.php @@ -3,7 +3,7 @@ * The tabs entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/task.php b/api/v1/entries/task.php index a4b2f8c43e..712041ace5 100644 --- a/api/v1/entries/task.php +++ b/api/v1/entries/task.php @@ -3,7 +3,7 @@ * The task entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskactive.php b/api/v1/entries/taskactive.php index d2cf375993..33701a4fa7 100644 --- a/api/v1/entries/taskactive.php +++ b/api/v1/entries/taskactive.php @@ -3,7 +3,7 @@ * The task active entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskassignto.php b/api/v1/entries/taskassignto.php index bf153f51ee..7dcb9245a3 100644 --- a/api/v1/entries/taskassignto.php +++ b/api/v1/entries/taskassignto.php @@ -3,7 +3,7 @@ * The task assignto entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskbatchcreate.php b/api/v1/entries/taskbatchcreate.php index 92fa3d2c47..a0a5f37c66 100644 --- a/api/v1/entries/taskbatchcreate.php +++ b/api/v1/entries/taskbatchcreate.php @@ -3,7 +3,7 @@ * The task batch create entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskclose.php b/api/v1/entries/taskclose.php index 774c115c53..3767a36cb0 100644 --- a/api/v1/entries/taskclose.php +++ b/api/v1/entries/taskclose.php @@ -3,7 +3,7 @@ * The task close entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskcomponent.php b/api/v1/entries/taskcomponent.php index 50b83afef8..c81876be29 100644 --- a/api/v1/entries/taskcomponent.php +++ b/api/v1/entries/taskcomponent.php @@ -3,7 +3,7 @@ * The task component entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskfinish.php b/api/v1/entries/taskfinish.php index 2c12a46cc6..f51cdd7674 100644 --- a/api/v1/entries/taskfinish.php +++ b/api/v1/entries/taskfinish.php @@ -3,7 +3,7 @@ * The task finish entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskpause.php b/api/v1/entries/taskpause.php index 7548fa25e0..00930ed195 100644 --- a/api/v1/entries/taskpause.php +++ b/api/v1/entries/taskpause.php @@ -3,7 +3,7 @@ * The task pause entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskrecordestimate.php b/api/v1/entries/taskrecordestimate.php index b6e87b068d..76dc04f077 100644 --- a/api/v1/entries/taskrecordestimate.php +++ b/api/v1/entries/taskrecordestimate.php @@ -3,7 +3,7 @@ * The task recordEstimate entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/tasks.php b/api/v1/entries/tasks.php index 26905efb41..d48cd6c074 100644 --- a/api/v1/entries/tasks.php +++ b/api/v1/entries/tasks.php @@ -3,7 +3,7 @@ * The tasks entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/taskstart.php b/api/v1/entries/taskstart.php index d21d4bb37a..8f7827d95c 100644 --- a/api/v1/entries/taskstart.php +++ b/api/v1/entries/taskstart.php @@ -3,7 +3,7 @@ * The task start entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testcase.php b/api/v1/entries/testcase.php index 327b0f41a8..e880ad7b8c 100644 --- a/api/v1/entries/testcase.php +++ b/api/v1/entries/testcase.php @@ -3,7 +3,7 @@ * The testcase entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testcases.php b/api/v1/entries/testcases.php index 2b4e49bc7e..11ed761d97 100644 --- a/api/v1/entries/testcases.php +++ b/api/v1/entries/testcases.php @@ -3,7 +3,7 @@ * The testcases entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testresults.php b/api/v1/entries/testresults.php index a169f5e1ea..f2fc03c669 100644 --- a/api/v1/entries/testresults.php +++ b/api/v1/entries/testresults.php @@ -3,7 +3,7 @@ * The testresults entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testsuite.php b/api/v1/entries/testsuite.php index a3074a07d9..e1a0ea31b4 100644 --- a/api/v1/entries/testsuite.php +++ b/api/v1/entries/testsuite.php @@ -3,7 +3,7 @@ * The testsuite entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testsuites.php b/api/v1/entries/testsuites.php index 53ff546a33..da0799e2d2 100644 --- a/api/v1/entries/testsuites.php +++ b/api/v1/entries/testsuites.php @@ -3,7 +3,7 @@ * The testsuites entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testtask.php b/api/v1/entries/testtask.php index 50a3236333..c4d80e76ea 100644 --- a/api/v1/entries/testtask.php +++ b/api/v1/entries/testtask.php @@ -3,7 +3,7 @@ * The testtask entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/testtasks.php b/api/v1/entries/testtasks.php index cc34ac7e28..81e2fb614c 100644 --- a/api/v1/entries/testtasks.php +++ b/api/v1/entries/testtasks.php @@ -3,7 +3,7 @@ * The testtasks entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/todo.php b/api/v1/entries/todo.php index 466ca67b6c..1564f14a12 100644 --- a/api/v1/entries/todo.php +++ b/api/v1/entries/todo.php @@ -3,7 +3,7 @@ * The todo entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/todoactivate.php b/api/v1/entries/todoactivate.php index 77005d42e3..6528650b15 100644 --- a/api/v1/entries/todoactivate.php +++ b/api/v1/entries/todoactivate.php @@ -3,7 +3,7 @@ * The todo activate entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/todofinish.php b/api/v1/entries/todofinish.php index ebb60dbde8..d7ee7b9bad 100644 --- a/api/v1/entries/todofinish.php +++ b/api/v1/entries/todofinish.php @@ -3,7 +3,7 @@ * The todo finish entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/todos.php b/api/v1/entries/todos.php index ac116d4d3e..f4d3806fc2 100644 --- a/api/v1/entries/todos.php +++ b/api/v1/entries/todos.php @@ -3,7 +3,7 @@ * The todos entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/tokens.php b/api/v1/entries/tokens.php index db71ddd816..e330aa931d 100644 --- a/api/v1/entries/tokens.php +++ b/api/v1/entries/tokens.php @@ -3,7 +3,7 @@ * The tokens entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php index 5c371e7ae3..fef553d697 100644 --- a/api/v1/entries/user.php +++ b/api/v1/entries/user.php @@ -3,7 +3,7 @@ * The user entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/users.php b/api/v1/entries/users.php index efbdb05b85..3e0a5bf543 100644 --- a/api/v1/entries/users.php +++ b/api/v1/entries/users.php @@ -3,7 +3,7 @@ * The users entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/views.php b/api/v1/entries/views.php index bb229944d2..56d6c61643 100644 --- a/api/v1/entries/views.php +++ b/api/v1/entries/views.php @@ -3,7 +3,7 @@ * The views entry point of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/zfile.php b/api/v1/entries/zfile.php index 3fdb8cc5a4..ddfb530149 100644 --- a/api/v1/entries/zfile.php +++ b/api/v1/entries/zfile.php @@ -3,7 +3,7 @@ * The file entry point for yueku. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/zfilecontent.php b/api/v1/entries/zfilecontent.php index 592572ff29..64e6d4e7aa 100644 --- a/api/v1/entries/zfilecontent.php +++ b/api/v1/entries/zfilecontent.php @@ -3,7 +3,7 @@ * The file entry point for yueku. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/zfolder.php b/api/v1/entries/zfolder.php index 6cc5e5f6ef..bd4afc1a4b 100644 --- a/api/v1/entries/zfolder.php +++ b/api/v1/entries/zfolder.php @@ -3,7 +3,7 @@ * The root folder entry point for yueku. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/api/v1/entries/zfolders.php b/api/v1/entries/zfolders.php index e31c4e0228..920dc6c8c2 100644 --- a/api/v1/entries/zfolders.php +++ b/api/v1/entries/zfolders.php @@ -3,7 +3,7 @@ * The root folder entry point for yueku. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package entries * @version 1 diff --git a/config/zentaopms.php b/config/zentaopms.php index 86ef7cdbe9..59e0828201 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -3,7 +3,7 @@ * The config file of zentaophp. Don't modify this file directly, copy the item to my.php and change it. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) -* @license ZPL (http://zpl.pub/page/zplv12.html) +* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package config * @version $Id: zentaopms.php 5068 2017-06-20 15:35:22Z pengjx $ diff --git a/db/update17.0.sql b/db/update17.0.sql new file mode 100644 index 0000000000..3dc0343f99 --- /dev/null +++ b/db/update17.0.sql @@ -0,0 +1,6 @@ +DELETE from zt_report where `code` = 'product-invest'; +ALTER TABLE `zt_review` ADD docVersion smallint(6) NOT NULL AFTER `doc`; + +DELETE FROM `zt_workflowaction` WHERE `module`='story' AND `action`='browse'; +DELETE FROM `zt_workflowaction` WHERE `module`='task' AND `action`='browse'; +DELETE FROM `zt_workflowaction` WHERE `module`='build' AND `action`='browse'; \ No newline at end of file diff --git a/db/zentao.sql b/db/zentao.sql index 2c8f08a0f3..f35bf2e361 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -6791,7 +6791,6 @@ CREATE OR REPLACE VIEW `ztv_daybugresolve` AS select count(*) AS `bugresolve`,le CREATE OR REPLACE VIEW `ztv_dayactions` AS select count(*) AS `actions`,left(`zt_action`.`date`,10) AS `day` from `zt_action` group by left(`zt_action`.`date`,10); REPLACE INTO `zt_report` (`code`, `name`, `module`, `sql`, `vars`, `langs`, `params`, `step`, `desc`, `addedBy`, `addedDate`) VALUES -('product-invest', '{\"zh-cn\":\"\\u4ea7\\u54c1\\u6295\\u5165\\u8868\",\"zh-tw\":\"\\u7522\\u54c1\\u6295\\u5165\\u8868\",\"en\":\"Product Investment\"}', ',product', 'select t1.id,t1.name,1 as projects, round(t3.consumed,2) as consumed from TABLE_PRODUCT as t1\r\n left join TABLE_PROJECTPRODUCT as t2 on t1.id=t2.product\r\n left join ztv_projectsummary as t3 on t2.project=t3.project\r\n left join TABLE_PROJECT as t4 on t2.project=t4.id\r\n left join TABLE_PROGRAM as t5 on t1.program=t5.id\r\n where t1.deleted=\'0\' and t4.deleted=\'0\' and t4.type=\'project\'\r\norder by t5.`order` asc, t1.line desc, t1.`order` asc', '', '{\"projects\":{\"zh-cn\":\"\\u9879\\u76ee\\u6570\",\"zh-tw\":\"\\u9879\\u76ee\\u6570\",\"en\":\"Projects\"},\"consumed\":{\"zh-cn\":\"\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\",\"zh-tw\":\"\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\",\"en\":\"Cost(h)\"}}', '{\"group1\":\"name\",\"group2\":\"\",\"reportField\":[\"projects\",\"consumed\"],\"reportType\":[\"sum\",\"sum\"],\"sumAppend\":[\"projects\",\"consumed\"]}', 2, '{\"zh-cn\":\"\\u5217\\u51fa\\u6bcf\\u4e2a\\u4ea7\\u54c1\\u7684\\u9879\\u76ee\\u603b\\u6570\\uff0c\\u5df2\\u7ecf\\u6d88\\u8017\\u7684\\u5de5\\u65f6\\u3002\",\"zh-tw\":\"\\u5217\\u51fa\\u6bcf\\u500b\\u7522\\u54c1\\u7684\\u9805\\u76ee\\u7e3d\\u6578\\uff0c\\u5df2\\u7d93\\u6d88\\u8017\\u7684\\u5de5\\u6642\\u3002\",\"en\":\"Number of projects and consumed hours.\"}', 'admin', '2015-07-20 14:21:31'), ('product-progress', '{\"zh-cn\":\"\\u4ea7\\u54c1\\u5b8c\\u6210\\u5ea6\\u7edf\\u8ba1\\u8868\",\"zh-tw\":\"\\u7522\\u54c1\\u5b8c\\u6210\\u5ea6\\u7d71\\u8a08\\u8868\",\"en\":\"Product Progress\"}', ',product', 'select t1.*,t2.name, (case when t1.status = \'closed\' or t1.stage = \'released\' then 1 else 0 end) as done, 1 as count from TABLE_STORY as t1 \r\nleft join TABLE_PRODUCT as t2 on t1.product=t2.id \r\nleft join TABLE_PROGRAM as t3 on t2.program=t3.id \r\nwhere t1.deleted=\'0\' and t2.deleted=\'0\'\r\norder by t3.`order` asc, t2.line desc, t2.`order` asc', '', '{\"count\":{\"zh-cn\":\"\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\\u9700\\u6c42\\u6570\",\"en\":\"Stories\"},\"done\":{\"zh-cn\":\"\\u5b8c\\u6210\\u6570\",\"zh-tw\":\"\\u5b8c\\u6210\\u6570\",\"en\":\"Done\"}}', '{\"group1\":\"name\",\"group2\":\"\",\"reportField\":[\"count\",\"done\"],\"reportType\":[\"sum\",\"sum\"],\"sumAppend\":[\"count\",\"done\"],\"percent\":{\"1\":\"1\"},\"contrast\":{\"1\":\"count\"},\"showAlone\":{\"1\":\"1\"}}', 2, '{\"zh-cn\":\"\\u6309\\u7167\\u4ea7\\u54c1\\u5217\\u51fa\\u9700\\u6c42\\u603b\\u6570\\uff0c\\u5b8c\\u6210\\u7684\\u603b\\u6570(\\u72b6\\u6001\\u662f\\u5173\\u95ed\\uff0c\\u6216\\u8005\\u7814\\u53d1\\u9636\\u6bb5\\u662f\\u53d1\\u5e03)\\uff0c\\u5b8c\\u6210\\u7684\\u767e\\u5206\\u6bd4\\u3002\",\"zh-tw\":\"\\u6309\\u7167\\u7522\\u54c1\\u5217\\u51fa\\u9700\\u6c42\\u7e3d\\u6578\\uff0c\\u5b8c\\u6210\\u7684\\u7e3d\\u6578(\\u72c0\\u614b\\u662f\\u95dc\\u9589\\uff0c\\u6216\\u8005\\u7814\\u767c\\u968e\\u6bb5\\u662f\\u767c\\u5e03)\\uff0c\\u5b8c\\u6210\\u7684\\u767e\\u5206\\u6bd4\\u3002\",\"en\":\"Number of total stories,done stories(state is closed, or stage is released), percent of completion.\"}', 'admin', '2015-07-21 15:07:48'), ('story-status', '{\"zh-cn\":\"\\u4ea7\\u54c1\\u9700\\u6c42\\u72b6\\u6001\\u5206\\u5e03\\u8868\",\"zh-tw\":\"\\u7522\\u54c1\\u9700\\u6c42\\u72c0\\u614b\\u5206\\u5e03\\u8868\",\"en\":\"Story Status\"}', ',product', 'select t1.*,t2.name from TABLE_STORY as t1\r\n left join TABLE_PRODUCT as t2 on t1.product=t2.id \r\nleft join TABLE_PROGRAM as t3 on t2.program=t3.id \r\nwhere t1.deleted=\'0\' and t2.deleted=\'0\'\r\norder by t3.`order` asc, t2.line desc, t2.`order` asc', '', '', '{\"group1\":\"name\",\"group2\":\"\",\"reportField\":[\"status\"],\"reportType\":[\"count\"],\"sumAppend\":[\"\"],\"reportTotal\":[\"1\"]}', 2, '{\"zh-cn\":\"\\u6309\\u7167\\u4ea7\\u54c1\\u5217\\u51fa\\u9700\\u6c42\\u603b\\u6570\\uff0c\\u72b6\\u6001\\u7684\\u5206\\u5e03\\u60c5\\u51b5\\u3002\",\"zh-tw\":\"\\u6309\\u7167\\u7522\\u54c1\\u5217\\u51fa\\u9700\\u6c42\\u7e3d\\u6578\\uff0c\\u72c0\\u614b\\u7684\\u5206\\u5e03\\u60c5\\u6cc1\\u3002\",\"en\":\"Total number and status distribution of stories.\"}', 'admin', '2015-07-21 15:35:38'), ('story-stage', '{\"zh-cn\":\"\\u4ea7\\u54c1\\u9700\\u6c42\\u9636\\u6bb5\\u5206\\u5e03\\u8868\",\"zh-tw\":\"\\u7522\\u54c1\\u9700\\u6c42\\u968e\\u6bb5\\u5206\\u5e03\\u8868\",\"en\":\"Story Stage\"}', ',product', 'select t1.*,t2.name from TABLE_STORY as t1\r\n left join TABLE_PRODUCT as t2 on t1.product=t2.id \r\nleft join TABLE_PROGRAM as t3 on t2.program=t3.id \r\nwhere t1.deleted=\'0\' and t2.deleted=\'0\'\r\norder by t3.`order` asc, t2.line desc, t2.`order` asc', '', '', '{\"group1\":\"name\",\"group2\":\"\",\"reportField\":[\"stage\"],\"reportType\":[\"count\"],\"sumAppend\":[\"\"],\"reportTotal\":[\"1\"]}', 2, '{\"zh-cn\":\"\\u6309\\u7167\\u4ea7\\u54c1\\u5217\\u51fa\\u9700\\u6c42\\u603b\\u6570\\uff0c\\u7814\\u53d1\\u9636\\u6bb5\\u7684\\u5206\\u5e03\\u60c5\\u51b5\\u3002\",\"zh-tw\":\"\\u6309\\u7167\\u7522\\u54c1\\u5217\\u51fa\\u9700\\u6c42\\u7e3d\\u6578\\uff0c\\u7814\\u767c\\u968e\\u6bb5\\u7684\\u5206\\u5e03\\u60c5\\u6cc1\\u3002\",\"en\":\"Total number and stage distribution of stories \"}', 'admin', '2015-07-21 15:38:34'), @@ -9420,6 +9419,7 @@ CREATE TABLE IF NOT EXISTS `zt_review` ( `object` mediumint(8) NOT NULL, `template` mediumint(8) NOT NULL, `doc` mediumint(8) DEFAULT NULL, + `docVersion` smallint(6) DEFAULT NULL, `status` char(30) NOT NULL, `reviewedBy` varchar(255) NOT NULL, `auditedBy` varchar(255) NOT NULL, diff --git a/doc/COPYING b/doc/COPYING deleted file mode 100644 index 94a9ed024d..0000000000 --- a/doc/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/doc/COPYING.LESSER b/doc/COPYING.LESSER deleted file mode 100644 index fc8a5de7ed..0000000000 --- a/doc/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/doc/FLOWCHART.url b/doc/FLOWCHART.url deleted file mode 100755 index 84ca9fb3d6..0000000000 --- a/doc/FLOWCHART.url +++ /dev/null @@ -1,5 +0,0 @@ -[InternetShortcut] -URL=http://www.zentao.net/help-read-79236.html -IDList= -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,2 diff --git a/doc/HELP.url b/doc/HELP.url deleted file mode 100755 index 84ca9fb3d6..0000000000 --- a/doc/HELP.url +++ /dev/null @@ -1,5 +0,0 @@ -[InternetShortcut] -URL=http://www.zentao.net/help-read-79236.html -IDList= -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,2 diff --git a/doc/LICENSE.CN b/doc/LICENSE.CN index 37c4a5952f..710bcd5712 100644 --- a/doc/LICENSE.CN +++ b/doc/LICENSE.CN @@ -1,12 +1,9 @@ 禅道项目管理软件使用 Z PUBLIC LICENSE(以下简称ZPL) 1.2 和 Affero General Public License(以下简称AGPL) 双授权协议。 -默认使用ZPL协议，您也可以选择遵守AGPL协议使用我们的软件。 - -ZenTao Project Management Software is licensed under the Z PUBLIC LICENSE (ZPL) 1.2 and the Affero General Public License (AGPL). -The ZPL is applied by default, or you can choose to use our software under the AGPL. +您可以选择ZPL协议或AGPL协议使用我们的软件。 ----------------------------------------------------------------------------------------------------------------------------------------------------------------- -Z PUBLIC LICENSE 1.2 +Z PUBLIC LICENSE(ZPL) 1.2 许可 diff --git a/doc/LICENSE.EN b/doc/LICENSE.EN index 714eef045c..e6c758402d 100644 --- a/doc/LICENSE.EN +++ b/doc/LICENSE.EN @@ -1,9 +1,13 @@ -ZenTao Project Management Software is licensed under the Z PUBLIC LICENSE (ZPL) 1.2 and the Affero General Public License (AGPL). -The ZPL is applied by default, or you can choose to use our software under the AGPL. +The source code of zentao is covered by the following dual licenses: + +(1) ZPL 1.2: http://zpl.pub/page/zplv12.html +(2) AGPL 3.0: https://www.gnu.org/licenses/agpl-3.0.en.html + +The default license agreement is the ZPL, or you can choose to use our source code under the AGPL. ----------------------------------------------------------------------------------------------------------------------------------------------------------------- -Z PUBLIC LICENSE 1.2 +Z PUBLIC LICENSE(ZPL) 1.2 Authorization diff --git a/doc/README b/doc/README deleted file mode 100644 index 5a40d5777b..0000000000 --- a/doc/README +++ /dev/null @@ -1,31 +0,0 @@ -ZenTao is a Scrum tool which is licensed under ZPL 1.2. - -The key feature of ZenTao: - -1. Product management(product backlog) - - story management - plan management - release management - -2. Project management(sprint backlog) - - task management - team management - build management - burn down chart - -3. QA management - - bug tracking - test case management - test task management - -4. Document management - -5. User management - -6. Todo management - -ZenTao official website: https://www.zentao.pm/ -ZenTao demo site: http://demo.zentao.pm/ diff --git a/doc/README.zh_CN b/doc/README.zh_CN deleted file mode 100644 index 152d4fe9a6..0000000000 --- a/doc/README.zh_CN +++ /dev/null @@ -1,44 +0,0 @@ -一、什么是禅道项目管理软件 - -禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件，它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。官方网站：www.ZenTaoPMS.com - -禅道项目管理软件使用PHP + MySQL开发，基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。 - -禅道在手，项目无忧！ - -禅道项目管理软件由QingDao Nature Easy Soft Network Technology Co,LTD (http://www.cnezsoft.com)开发。 - -二、禅道的含义 - -Zen是“禅”的意思，Tao是“道”的意思。ZenTao合意为禅与道。这个名称是我在读《编程之禅》和《编程之道》的时候受到启发，决定采用这个比较有中国味道的名字。 - -三、禅道项目管理软件的来由： - -说到这个问题，要从BugFree谈起。自从04年发布BugFree以来到2007年，BugFree陆续发布了五六个版本，在Bug管理方面基本上已经完备。但这个时候产生了一些新的问题。很多网友拿着BugFree进行改动，改造为其他的管理系统。还经常有网友问，BugFree可以不可以加入项目管理的功能。我也一直在思考这些问题。后来我加入了阿里巴巴，在中国雅虎‘、阿里妈妈、淘宝三年的工作经历中，参加了大大小小的项目。也深为项目管理所困惑。于是就产生了做一个工具来解决项目管理的问题。 - -由于种种原因，我这个愿望在阿里巴巴并没有实现。说来也是一件幸事，这样我可以把它开源来发布。从今年初我就开始着手考虑这套管理软件的设计。整整花了半年的时间在考虑。7月份从阿里巴巴辞职之后，我开始有有了相对比较多的一点时间来进行这套系统的开发。同时也非常感谢现在的这家单位，为我开发禅道项目管理软件提供了大力的支持。 - -四、为什么还要做禅道项目管理软件： - -很多朋友会问，已经有很多的开源项目管理软件或者系统了，为什么还要自己做一个呢？主要原因是我认为现在的开源项目管理软件对这个问题解决的并不好，比如缺乏需求管理，bug管理等功能。而且很多开源的项目管理软件使用起来也不方便。 - -市场上也有很多商业的软件，但收费都不菲，而且也未必见得好用。 - -现在也有很多在线的项目管理服务，比如国外的basecamp，国内的易度，忙吧等。但我的观点，这些在线的项目管理软件功能有限，缺乏定制，访问速度无法保证，而且缺乏保密。 - -五、禅道项目管理软件的特点： - -集成了产品管理、项目管理、测试管理、人员管理、发布管理、事务管理等功能于一体。你只需要一个软件就可以完成项目管理的最核心的任务。 -开源免费，降低企业部署的成本。 -功能注重实效，使用方便，没有太多复杂的概念。我设计的理念是一个没有做过项目管理的人经过10分钟的培训可以使用它进行项目管理。:) -基于PHP+MySQL开发，企业自主改动方便。并且基于ZenTaoPHP框架，为第三方开发者的加入打下了坚实的基础。 -主要理念基于scrum，同时结合了PMP里面的很多概念。 -支持多公司，多项目，多产品，多团队的开发。 -灵活的权限设置。 -支持产品与项目之间的矩阵关系。 - -六、禅道项目管理软件需要您的帮助 - -禅道项目管理软件需要您的帮助，无论您是开发人员，抑或是项目经理，或者是产品经理，还是测试人员，又或者是开源爱好者，您都可以在禅道项目管理软件找到参与的地方。我们会以非常open的心态打造一个禅道项目管理软件的社区。我相信，禅道社区的成功，才是禅道项目管理软件的成功。 - -大家如果想加入，可以和我联系：chunsheng@cnezsoft.com diff --git a/doc/THIRDPARTY b/doc/THIRDPARTY deleted file mode 100644 index 91d202cdc7..0000000000 --- a/doc/THIRDPARTY +++ /dev/null @@ -1,14 +0,0 @@ -禅道项目管理软件使用了很多第三方的开源类库，在此向“巨人们 ”表示敬意！ - -CSS框架 ：YUI 3 beta 中的 CSS套件，包括basic.css, reset.css, font.css和grid.css。官方网站：http://developer.yahoo.com/yui/3/ -JS框架 ：JQUERY 1.3版本。官方网站：http://www.jquery.com -JQUER插件：alert chosen colorize flot jquerytools sparkline treetable validation autocomplete colorbox datepicker reverseorder tablesorter treeview - -编辑器：kindeditor -MAIL类 ：phpmailer 5.1，官方网站： http://phpmailer.sourceforge.net -HTTP类 ：snoopy 官方网站：http://snoopy.sourceforge.net/ -报表框架 ：fushioncharts free 官方网站：http://www.fusioncharts.com/free/ - -zip压缩：pclzip - -yaml类：spyc diff --git a/doc/TODO b/doc/TODO deleted file mode 100644 index b33e2b2ae7..0000000000 --- a/doc/TODO +++ /dev/null @@ -1 +0,0 @@ -Please see http://pms.zentao.net/product/ diff --git a/doc/UPGRADE b/doc/UPGRADE deleted file mode 100644 index 62b48fef36..0000000000 --- a/doc/UPGRADE +++ /dev/null @@ -1 +0,0 @@ -升级，请参考 http://www.zentao.net/book/zentaopmshelp/41.html diff --git a/doc/VIDEO.url b/doc/VIDEO.url deleted file mode 100755 index 15b86db009..0000000000 --- a/doc/VIDEO.url +++ /dev/null @@ -1,5 +0,0 @@ -[InternetShortcut] -URL=http://www.zentao.net/video-browse.html -IDList= -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,2 diff --git a/doc/doxygen/doxygen.conf b/doc/doxygen/doxygen.conf deleted file mode 100644 index f1cc53309f..0000000000 --- a/doc/doxygen/doxygen.conf +++ /dev/null @@ -1,1417 +0,0 @@ -# Doxyfile 1.5.6 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = ZenTaoPMS - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 1.4 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = ./api.doxygen - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, -# and Ukrainian. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = YES - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = YES - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = YES - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = framework lib module www bin config - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = YES - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to FRAME, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values -# for this tag are: HIERARCHIES, which will generate the Groups, Directories, -# and Class Hiererachy pages using a tree view instead of an ordered list; -# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which -# disables this behavior completely. For backwards compatibility with previous -# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE -# respectively. - -GENERATE_TREEVIEW = YES - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = YES - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = YES - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = YES - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is enabled by default, which results in a transparent -# background. Warning: Depending on the platform used, enabling this option -# may lead to badly anti-aliased labels on the edges of a graph (i.e. they -# become hard to read). - -DOT_TRANSPARENT = YES - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = YES diff --git a/doc/phpdoc/blank.tpl b/doc/phpdoc/blank.tpl deleted file mode 100644 index 13b04d7481..0000000000 --- a/doc/phpdoc/blank.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - {$maintitle} - - - - -

{$maintitle}

-Welcome to {$package}!
-
-This documentation was generated by phpDocumentor v{$phpdocversion}
- - diff --git a/doc/phpdoc/header.tpl b/doc/phpdoc/header.tpl deleted file mode 100644 index 113367583b..0000000000 --- a/doc/phpdoc/header.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - - {$title} - - - - - {if $top3}
{/if} - diff --git a/doc/phpdoc/index.tpl b/doc/phpdoc/index.tpl deleted file mode 100644 index e70e7c14ff..0000000000 --- a/doc/phpdoc/index.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {$title} - - - - - - - - - - - <H2>Frame Alert</H2> - <P>This document is designed to be viewed using the frames feature. - If you see this message, you are using a non-frame-capable web client.</P> - - - diff --git a/doc/phpdoc/top_frame.tpl b/doc/phpdoc/top_frame.tpl deleted file mode 100644 index cfbb0604a6..0000000000 --- a/doc/phpdoc/top_frame.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - -{$title} - - - - - -{if count($packages) > 1} -Packages - -{/if} -www.zentao.net - - diff --git a/extension/lite/attend/ext/view/personal.html.php b/extension/lite/attend/ext/view/personal.html.php index 784ba54c82..0aba583577 100644 --- a/extension/lite/attend/ext/view/personal.html.php +++ b/extension/lite/attend/ext/view/personal.html.php @@ -3,7 +3,7 @@ * The personal view file of attend module of Ranzhi. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author liyuchun * @package attend * @version $Id$ diff --git a/extension/lite/block/ext/view/welcome.html.php b/extension/lite/block/ext/view/welcome.html.php index ebad8c75c6..172e5999ee 100644 --- a/extension/lite/block/ext/view/welcome.html.php +++ b/extension/lite/block/ext/view/welcome.html.php @@ -3,7 +3,7 @@ * The welcome view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/extension/lite/execution/ext/view/create.html.php b/extension/lite/execution/ext/view/create.html.php index 9aa6408671..745ad6429e 100644 --- a/extension/lite/execution/ext/view/create.html.php +++ b/extension/lite/execution/ext/view/create.html.php @@ -3,7 +3,7 @@ * The create view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/extension/lite/group/ext/view/create.html.php b/extension/lite/group/ext/view/create.html.php index c37f04af1e..74bc77783c 100644 --- a/extension/lite/group/ext/view/create.html.php +++ b/extension/lite/group/ext/view/create.html.php @@ -3,7 +3,7 @@ * The create view of group module for lite vision of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: create.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/extension/lite/install/ext/view/step6.html.php b/extension/lite/install/ext/view/step6.html.php index d0cf2848d3..ce1966333a 100644 --- a/extension/lite/install/ext/view/step6.html.php +++ b/extension/lite/install/ext/view/step6.html.php @@ -3,7 +3,7 @@ * The html template file of index method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: step5.html.php 2568 2012-02-18 15:53:35Z zhujinyong@cnezsoft.com$ diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php index 06cd7e0c60..3406eb1c33 100644 --- a/extension/lite/kanban/ext/model/lite.php +++ b/extension/lite/kanban/ext/model/lite.php @@ -5,7 +5,7 @@ public function __construct($appName = '') if($this->app->getModuleName() == 'kanban') $this->lang->kanban->menu = new stdclass(); } -public function getKanban4Group($executionID, $browseType, $groupBy) +public function getKanban4Group($executionID, $browseType, $groupBy, $searchValue = '') { /* Get card data. */ $cardList = array(); @@ -16,13 +16,24 @@ public function getKanban4Group($executionID, $browseType, $groupBy) $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList); if(empty($lanes)) return array(); - $columns = $this->dao->select('t1.*, t2.`type` as columnType')->from(TABLE_KANBANCELL)->alias('t1') + $execution = $this->loadModel('execution')->getByID($executionID); + + $columns = $this->dao->select('t1.*, GROUP_CONCAT(t1.cards) as cards, t2.`type` as columnType, t2.limit, t2.name as columnName, t2.color')->from(TABLE_KANBANCELL)->alias('t1') ->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.`column` = t2.id') + ->leftJoin(TABLE_KANBANLANE)->alias('t3')->on('t1.lane = t3.id') + ->leftJoin(TABLE_KANBANREGION)->alias('t4')->on('t1.kanban = t4.kanban') ->where('t1.kanban')->eq($executionID) ->andWhere('t1.`type`')->eq($browseType) - ->fetchAll(); + ->beginIF(isset($execution->type) and $execution->type == 'kanban') + ->andWhere('t3.deleted')->eq(0) + ->andWhere('t4.deleted')->eq(0) + ->fi() + ->groupBy('columnType') + ->orderBy('column_asc') + ->fetchAll('columnType'); $cardGroup = array(); + $actions = array('setColumn', 'setWIP'); foreach($columns as $column) { if(empty($column->cards)) continue; @@ -48,12 +59,21 @@ public function getKanban4Group($executionID, $browseType, $groupBy) $laneData['defaultCardType'] = $browseType; /* Construct kanban column data. */ - foreach($columnList as $columnID => $columnName) + foreach($columns as $column) { + $columnID = $column->column; + $columnName = $column->columnName; $parentColumn = ''; if(in_array($columnID, array('testing', 'tested'))) $parentColumn = 'test'; if(in_array($columnID, array('fixing', 'fixed'))) $parentColumn = 'resolving'; + /* Judge column action priv. */ + $column->actions = array(); + foreach($actions as $action) + { + if($this->isClickable($column, $action)) $column->actions[] = $action; + } + $columnData[$columnID]['id'] = $columnID; $columnData[$columnID]['type'] = $columnID; $columnData[$columnID]['name'] = $columnName; @@ -62,6 +82,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy) $columnData[$columnID]['laneType'] = $browseType; $columnData[$columnID]['asParent'] = in_array($columnID, array('develop', 'test', 'resolving')) ? true : false; $columnData[$columnID]['parentType'] = $parentColumn; + $columnData[$columnID]['actions'] = $column->actions; $cardOrder = 1; $objects = zget($cardGroup, $columnID, array()); @@ -114,7 +135,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy) * @access public * @return array */ -public function getCardGroupByExecution($executionID, $browseType = 'all', $orderBy = 'id_asc') +public function getCardGroupByExecution($executionID, $browseType = 'all', $orderBy = 'id_asc', $searchValue = '') { $cards = $this->dao->select('t1.*, t2.type as columnType') ->from(TABLE_KANBANCELL)->alias('t1') diff --git a/extension/lite/kanban/ext/view/import.html.php b/extension/lite/kanban/ext/view/import.html.php index ec508ac7f7..ca9886c3d3 100644 --- a/extension/lite/kanban/ext/view/import.html.php +++ b/extension/lite/kanban/ext/view/import.html.php @@ -3,7 +3,7 @@ * The import file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fangzhou Hu * @package kanban * @version $Id: import.html.php 935 2022-01-19 14:15:24Z hufangzhou@easycorp.ltd $ diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php index 075b047e80..f4679b24d8 100644 --- a/extension/lite/my/ext/view/task.html.php +++ b/extension/lite/my/ext/view/task.html.php @@ -3,7 +3,7 @@ * The task view file of dashboard module for lite vision of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Wenrui LI * @package dashboard * @version $Id: task.html.php 5101 2013-07-12 00:44:27Z chencongzhi520@gmail.com $ diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index 2735bcf69a..8f2c6f2f93 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 4909 2013-06-26 07:23:50Z chencongzhi520@gmail.com $ diff --git a/extension/lite/project/ext/view/browse.html.php b/extension/lite/project/ext/view/browse.html.php index e25fd4772f..2768521583 100644 --- a/extension/lite/project/ext/view/browse.html.php +++ b/extension/lite/project/ext/view/browse.html.php @@ -3,7 +3,7 @@ * The prjbrowse view file of project module for lite vision of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Wenrui LI * @package project * @version $Id: prjbrowse.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/extension/lite/project/ext/view/create.html.php b/extension/lite/project/ext/view/create.html.php index 2ea5b66046..dcaead759c 100644 --- a/extension/lite/project/ext/view/create.html.php +++ b/extension/lite/project/ext/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of project module for lite vision of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Wenrui LI * @package project * @version $Id: create.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index 6fc9eafed7..b9fc5931c4 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -3,7 +3,7 @@ * The html template file of all method of execution module for lite vision of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Wenrui LI * @package execution * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/extension/lite/project/ext/view/team.html.php b/extension/lite/project/ext/view/team.html.php index 74c975c412..95742d5095 100644 --- a/extension/lite/project/ext/view/team.html.php +++ b/extension/lite/project/ext/view/team.html.php @@ -3,7 +3,7 @@ * The team view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package project * @version $Id: team.html.php 4143 2021-08-11 11:01:06Z $ diff --git a/extension/lite/story/ext/view/batchcreate.html.php b/extension/lite/story/ext/view/batchcreate.html.php index 1fcfb127be..7fcedc44be 100644 --- a/extension/lite/story/ext/view/batchcreate.html.php +++ b/extension/lite/story/ext/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/extension/lite/story/ext/view/batchedit.html.php b/extension/lite/story/ext/view/batchedit.html.php index 2a87557ee3..b8c50dbe46 100644 --- a/extension/lite/story/ext/view/batchedit.html.php +++ b/extension/lite/story/ext/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package story * @version $Id$ diff --git a/extension/lite/story/ext/view/create.html.php b/extension/lite/story/ext/view/create.html.php index 1f6bfd7cfb..b2a5b6c85c 100644 --- a/extension/lite/story/ext/view/create.html.php +++ b/extension/lite/story/ext/view/create.html.php @@ -3,7 +3,7 @@ * The create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: create.html.php 4902 2013-06-26 05:25:58Z wyd621@gmail.com $ diff --git a/extension/lite/story/ext/view/edit.html.php b/extension/lite/story/ext/view/edit.html.php index 77db321046..fa7458cbc8 100644 --- a/extension/lite/story/ext/view/edit.html.php +++ b/extension/lite/story/ext/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: edit.html.php 4645 2013-04-11 08:32:09Z chencongzhi520@gmail.com $ diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php index fe957d658d..aa8dad0c79 100644 --- a/extension/lite/story/ext/view/view.html.php +++ b/extension/lite/story/ext/view/view.html.php @@ -3,7 +3,7 @@ * The view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: view.html.php 4952 2013-07-02 01:14:58Z chencongzhi520@gmail.com $ diff --git a/extension/lite/task/ext/lang/en/lite.php b/extension/lite/task/ext/lang/en/lite.php index 0d39e3d67b..1d7ffeb7f7 100644 --- a/extension/lite/task/ext/lang/en/lite.php +++ b/extension/lite/task/ext/lang/en/lite.php @@ -3,7 +3,7 @@ * The task module en file of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package task * @version $Id: en.php 5040 2022-02-28 09:36:18Z $ diff --git a/extension/lite/task/ext/lang/zh-cn/lite.php b/extension/lite/task/ext/lang/zh-cn/lite.php index 8a87f3c205..5d01172418 100644 --- a/extension/lite/task/ext/lang/zh-cn/lite.php +++ b/extension/lite/task/ext/lang/zh-cn/lite.php @@ -3,7 +3,7 @@ * The task module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: zh-cn.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php index b3f9af9942..69fe4dc162 100644 --- a/extension/lite/task/ext/view/batchcreate.html.php +++ b/extension/lite/task/ext/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package task * @version $Id$ diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php index 79d8a9078b..f63754c67d 100644 --- a/extension/lite/task/ext/view/create.html.php +++ b/extension/lite/task/ext/view/create.html.php @@ -3,7 +3,7 @@ * The create view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: create.html.php 5090 2013-07-10 05:49:24Z zhujinyonging@gmail.com $ diff --git a/extension/lite/tree/ext/view/browsetask.html.php b/extension/lite/tree/ext/view/browsetask.html.php index 3f96cf0465..83f05c9a0c 100644 --- a/extension/lite/tree/ext/view/browsetask.html.php +++ b/extension/lite/tree/ext/view/browsetask.html.php @@ -3,7 +3,7 @@ * The browse view file of tree module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: browse.html.php 4796 2013-06-06 02:21:59Z zhujinyonging@gmail.com $ diff --git a/extension/lite/user/ext/view/execution.html.php b/extension/lite/user/ext/view/execution.html.php index fca1be387c..43ccdc72cf 100644 --- a/extension/lite/user/ext/view/execution.html.php +++ b/extension/lite/user/ext/view/execution.html.php @@ -3,7 +3,7 @@ * The project view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: project.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/framework/helper.class.php b/framework/helper.class.php index ddc4aecb30..c944daa477 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -285,7 +285,7 @@ function formatTime($time, $format = '') { $time = str_replace('0000-00-00', '', $time); $time = str_replace('00:00:00', '', $time); - if(trim($time) == '') return ; + if(trim($time) == '') return ''; if($format) return date($format, strtotime($time)); return trim($time); } diff --git a/framework/model.class.php b/framework/model.class.php index aa59671506..45477bace2 100644 --- a/framework/model.class.php +++ b/framework/model.class.php @@ -103,10 +103,10 @@ class model extends baseModel if($action->extensionType == 'override') return $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type); $conditions = json_decode($action->conditions); - if($action->extensionType == 'extend' && $conditions) + if($action->extensionType == 'extend') { - $enabled = $this->loadModel('flow')->checkConditions($conditions, $data); - $label = $action->name; + if($icon != 'copy' and $methodName != 'create') $title = $action->name; + if($conditions) $enabled = $this->loadModel('flow')->checkConditions($conditions, $data); } else { diff --git a/lib/api/api.class.php b/lib/api/api.class.php index b5145945ee..024a951bf2 100755 --- a/lib/api/api.class.php +++ b/lib/api/api.class.php @@ -3,7 +3,7 @@ * The api library of zentaopms. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package API * @version $Id: api.class.php 4132 2013-01-18 02:30:05Z wwccss $ diff --git a/lib/date/date.class.php b/lib/date/date.class.php index 5737e68cb2..ffbbb9b28d 100644 --- a/lib/date/date.class.php +++ b/lib/date/date.class.php @@ -3,7 +3,7 @@ * The date library of zentaopms. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package Date * @version $Id: date.class.php 2605 2013-01-09 07:22:58Z wwccss $ diff --git a/lib/front/front.class.php b/lib/front/front.class.php index d9078b82f8..6913efb848 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -91,7 +91,7 @@ class html extends baseHTML $string .= "
'; } return $string; @@ -391,6 +391,19 @@ class html extends baseHTML */ class js extends baseJS { + /** + * Open a new app window. + * + * @param string $app + * @param string $url + * @static + * @access public + * @return string + */ + static public function openEntry($app, $url) + { + return self::start() . "$.apps.open('$url', '$app')" . self::end(); + } } /** diff --git a/lib/zdb/zdb.class.php b/lib/zdb/zdb.class.php index 7522203d8b..961a1ffc8b 100644 --- a/lib/zdb/zdb.class.php +++ b/lib/zdb/zdb.class.php @@ -3,7 +3,7 @@ * The zdb library of zentaopms, can be used to bakup and restore a database. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package Zdb * @version $Id$ diff --git a/lib/zfile/zfile.class.php b/lib/zfile/zfile.class.php index 3951ad20e2..8e24357a7a 100644 --- a/lib/zfile/zfile.class.php +++ b/lib/zfile/zfile.class.php @@ -3,7 +3,7 @@ * The zfile library of zentaopms. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package Zfile * @version $Id: zfile.class.php 2605 2013-01-09 07:22:58Z wwccss $ diff --git a/module/action/config.php b/module/action/config.php index 00ed8dfa4d..0e2a4fb2c5 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -67,3 +67,16 @@ $config->action->preferredTypeNum = 10; $config->action->preferredType = new stdclass(); $config->action->preferredType->new = array('user', 'story', 'task', 'bug', 'case', 'doc', 'program', 'product', 'project', 'execution'); $config->action->preferredType->classic = array('user', 'story', 'task', 'bug', 'case', 'doc', 'product', 'execution', 'productplan', 'build'); + +global $lang; +$config->trash = new stdclass(); +$config->trash->search['module'] = 'trash'; +$config->trash->search['fields']['objectName'] = $lang->action->objectName; +$config->trash->search['fields']['objectID'] = $lang->action->objectID; +$config->trash->search['fields']['actor'] = $lang->action->actor; +$config->trash->search['fields']['date'] = $lang->action->date; + +$config->trash->search['params']['objectName'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->trash->search['params']['objectID'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->trash->search['params']['actor'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->trash->search['params']['date'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); diff --git a/module/action/control.php b/module/action/control.php index 46f6b93c3d..808436a47d 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -3,7 +3,7 @@ * The control file of action module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id$ @@ -40,6 +40,8 @@ class action extends control * * @param string $browseType * @param string $type all|hidden + * @param bool $byQuery + * @param int $queryID * @param string $orderBy * @param int $recTotal * @param int $recPerPage @@ -47,7 +49,7 @@ class action extends control * @access public * @return void */ - public function trash($browseType = 'all', $type = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function trash($browseType = 'all', $type = 'all', $byQuery = false, $queryID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { $this->loadModel('backup'); @@ -81,13 +83,18 @@ class action extends control $this->session->set('practiceLibList', $uri, 'assetlib'); $this->session->set('componentLibList', $uri, 'assetlib'); + /* Build the search form. */ + $queryID = (int)$queryID; + $actionURL = $this->createLink('action', 'trash', "browseType=$browseType&type=$type&byQuery=true&queryID=myQueryID"); + $this->action->buildTrashSearchForm($queryID, $actionURL); + /* Get deleted objects. */ $this->app->loadClass('pager', $static = true); $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ $sort = common::appendOrder($orderBy); - $trashes = $this->action->getTrashes($browseType, $type, $sort, $pager); + $trashes = $byQuery ? $this->action->getTrashesBySearch($browseType, $type, $queryID, $sort, $pager) : $this->action->getTrashes($browseType, $type, $sort, $pager); $objectTypeList = $this->action->getTrashObjectTypes($type); $objectTypeList = array_keys($objectTypeList); @@ -96,6 +103,7 @@ class action extends control $preferredTypeConfig = $this->config->systemMode == 'new' ? $this->config->action->preferredType->new : $this->config->action->preferredType->classic; foreach($objectTypeList as $objectType) { + if(!isset($this->config->objectTables[$objectType])) continue; in_array($objectType, $preferredTypeConfig) ? $preferredType[$objectType] = $objectType : $moreType[$objectType] = $objectType; } if(count($preferredType) < $this->config->action->preferredTypeNum) @@ -117,6 +125,9 @@ class action extends control $this->view->preferredType = $preferredType; $this->view->moreType = $moreType; $this->view->preferredTypeConfig = $preferredTypeConfig; + $this->view->byQuery = $byQuery; + $this->view->queryID = $queryID; + $this->display(); } diff --git a/module/action/css/trash.css b/module/action/css/trash.css index 2f9190111c..e5b7a61042 100755 --- a/module/action/css/trash.css +++ b/module/action/css/trash.css @@ -1,7 +1,8 @@ .table-footer .table-actions {width: auto; visibility: visible; opacity: 1;} .table-footer .table-actions .text {line-height: 28px;} -table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +#mainContent table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} #mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text {color: #fff} .dropdown-menu .btn-active-text:hover .text:after {border-bottom: 0px;} +#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;} diff --git a/module/action/lang/de.php b/module/action/lang/de.php index f1efa44c41..0040fe54a3 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -3,7 +3,7 @@ * The action module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id: de.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 7f67123d50..e628f53cdf 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -3,7 +3,7 @@ * The action module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ @@ -42,6 +42,7 @@ $lang->action->hideAll = 'Hide All'; $lang->action->editComment = 'Edit Comment'; $lang->action->create = 'Add Comment'; $lang->action->comment = 'Comment'; +$lang->action->byQuery = 'Search'; $lang->action->undeleteAction = 'Reset Data'; $lang->action->hideOneAction = 'Hide Data'; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 36ddf6c25f..34663613e7 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -3,7 +3,7 @@ * The action module fr file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id: fr.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 953a74feb7..ed6607abdd 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -3,7 +3,7 @@ * The action module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id: zh-cn.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $ @@ -42,6 +42,7 @@ $lang->action->hideAll = '全部隐藏'; $lang->action->editComment = '修改备注'; $lang->action->create = '添加备注'; $lang->action->comment = '备注'; +$lang->action->byQuery = '搜索'; $lang->action->undeleteAction = '还原数据'; $lang->action->hideOneAction = '隐藏数据'; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 6be07b8f96..9a66017d80 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -3,7 +3,7 @@ * The action module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id: zh-tw.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $ diff --git a/module/action/model.php b/module/action/model.php index 20eb2b8f15..db1d6c8eb3 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -3,7 +3,7 @@ * The model file of action module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id: model.php 5028 2013-07-06 02:59:41Z wyd621@gmail.com $ @@ -683,6 +683,79 @@ class actionModel extends model return $trashes; } + /** + * Get deleted objects by search. + * + * @param string $objectType + * @param string $type all|hidden + * @param int $queryID + * @param string $orderBy + * @param object $pager + * @access public + * @return void + */ + public function getTrashesBySearch($objectType, $type, $queryID, $orderBy, $pager = null) + { + if($queryID and $queryID != 'myQueryID') + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set('trashQuery', $query->sql); + $this->session->set('trashForm', $query->form); + } + else + { + $this->session->set('trashQuery', ' 1 = 1'); + } + } + else + { + if($this->session->trashQuery == false) $this->session->set('trashQuery', ' 1 = 1'); + } + + $extra = $type == 'hidden' ? self::BE_HIDDEN : self::CAN_UNDELETED; + $trashQuery = $this->session->trashQuery; + $trashQuery = preg_replace("/`objectID`/", 't1.`objectID`', $trashQuery); + $trashQuery = preg_replace("/`actor`/", 't1.`actor`', $trashQuery); + $trashQuery = preg_replace("/`date`/", 't1.`date`', $trashQuery); + $table = $this->config->objectTables[$objectType]; + $nameField = isset($this->config->action->objectNameFields[$objectType]) ? 't2.' . "`{$this->config->action->objectNameFields[$objectType]}`" : ''; + + if($nameField) $trashQuery = preg_replace("/`objectName`/", $nameField, $trashQuery); + + if($objectType != 'pipeline') + { + $trashes = $this->dao->select("t1.*, $nameField as objectName")->from(TABLE_ACTION)->alias('t1') + ->leftJoin($table)->alias('t2')->on('t1.objectID=t2.id') + ->where('t1.action')->eq('deleted') + ->andWhere($trashQuery) + ->andWhere('t1.extra')->eq($extra) + ->andWhere('t1.vision')->eq($this->config->vision) + ->beginIF($objectType != 'all')->andWhere('t1.objectType')->eq($objectType)->fi() + ->orderBy($orderBy) + ->page($pager) + ->fetchAll('objectID'); + } + else + { + $trashes = $this->dao->select("t1.*, t1.objectType as type, t2.name as objectName, t2.type as objectType")->from(TABLE_ACTION)->alias('t1') + ->leftJoin(TABLE_PIPELINE)->alias('t2')->on('t1.objectID=t2.id') + ->where('t1.action')->eq('deleted') + ->andWhere($trashQuery) + ->andWhere('t1.extra')->eq($extra) + ->andWhere('t1.vision')->eq($this->config->vision) + ->andWhere('(t2.type')->eq('gitlab') + ->orWhere('t2.type')->eq('jenkins') + ->markRight(1) + ->orderBy($orderBy) + ->page($pager) + ->fetchAll('objectID'); + } + + return $trashes; + } + /** * Get object type list of trashes. * @@ -1931,4 +2004,20 @@ class actionModel extends model return $actions; } + + /** + * Build search form. + * + * @param int $queryID + * @param string $actionURL + * @access public + * @return void + */ + public function buildTrashSearchForm($queryID, $actionURL) + { + $this->config->trash->search['actionURL'] = $actionURL; + $this->config->trash->search['queryID'] = $queryID; + + $this->loadModel('search')->setSearchParams($this->config->trash->search); + } } diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index a2d0f1b123..b17cedf64f 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -3,7 +3,7 @@ * The trash view file of action module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package action * @version $Id$ @@ -55,17 +55,20 @@ echo ''; } ?> + + action->byQuery;?> +
goback, '', "class='btn'");?> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
- +
- recTotal}&recPerPage={$pager->recPerPage}"; ?> + recTotal}&recPerPage={$pager->recPerPage}"; ?> diff --git a/module/admin/control.php b/module/admin/control.php index b29a8ec5b1..4292bc3a53 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -3,7 +3,7 @@ * The control file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: control.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index eb244aac68..fe34cccd79 100644 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -3,7 +3,7 @@ * The admin module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index a416f743b0..c7577bf48e 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -3,7 +3,7 @@ * The admin module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index daba420ed0..1c6abffe8e 100644 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -3,7 +3,7 @@ * The admin module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 9c412d4b62..110a3be1d0 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -3,7 +3,7 @@ * The admin module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $ diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php index ba17bccad6..457818eefd 100644 --- a/module/admin/lang/zh-tw.php +++ b/module/admin/lang/zh-tw.php @@ -3,7 +3,7 @@ * The admin module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $ diff --git a/module/admin/model.php b/module/admin/model.php index fcb74b5bb7..1a6062e7f0 100644 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -3,7 +3,7 @@ * The model file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: model.php 5148 2013-07-16 01:31:08Z chencongzhi520@gmail.com $ diff --git a/module/admin/view/bind.html.php b/module/admin/view/bind.html.php index f98d4329b4..020cb17563 100644 --- a/module/admin/view/bind.html.php +++ b/module/admin/view/bind.html.php @@ -3,7 +3,7 @@ * The view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: view.html.php 2568 2012-02-09 06:56:35Z shiyangyangwork@yahoo.cn $ diff --git a/module/admin/view/certifyztemail.html.php b/module/admin/view/certifyztemail.html.php index a7a92c696a..e600300d24 100644 --- a/module/admin/view/certifyztemail.html.php +++ b/module/admin/view/certifyztemail.html.php @@ -3,7 +3,7 @@ * The certifyztmobile view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package admin * @version $Id$ diff --git a/module/admin/view/certifyztmobile.html.php b/module/admin/view/certifyztmobile.html.php index b4f6de971c..4eabea33f0 100644 --- a/module/admin/view/certifyztmobile.html.php +++ b/module/admin/view/certifyztmobile.html.php @@ -3,7 +3,7 @@ * The certifyztmobile view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package admin * @version $Id$ diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php index ff7f3f8f19..6c793818e1 100644 --- a/module/admin/view/checkweak.html.php +++ b/module/admin/view/checkweak.html.php @@ -3,7 +3,7 @@ * The safe view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package admin * @version $Id$ diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 129be4e884..2ac6cdc8a8 100644 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -3,7 +3,7 @@ * The view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: view.html.php 2568 2012-02-09 06:56:35Z shiyangyangwork@yahoo.cn $ diff --git a/module/admin/view/log.html.php b/module/admin/view/log.html.php index b538b90b11..a8c59e2a46 100644 --- a/module/admin/view/log.html.php +++ b/module/admin/view/log.html.php @@ -3,7 +3,7 @@ * The log view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package admin * @version $Id$ diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php index ba914c8ef7..1c028359be 100644 --- a/module/admin/view/register.html.php +++ b/module/admin/view/register.html.php @@ -3,7 +3,7 @@ * The view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package admin * @version $Id: view.html.php 2568 2012-02-09 06:56:35Z shiyangyangwork@yahoo.cn $ diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index 2868a02f65..258bc799a9 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -3,7 +3,7 @@ * The safe view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package admin * @version $Id$ diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php index 5be91c71b6..8b65eb2edf 100644 --- a/module/admin/view/sso.html.php +++ b/module/admin/view/sso.html.php @@ -3,7 +3,7 @@ * The sso view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package admin * @version $Id$ diff --git a/module/admin/view/ztcompany.html.php b/module/admin/view/ztcompany.html.php index 9cd5285164..ac963314b8 100644 --- a/module/admin/view/ztcompany.html.php +++ b/module/admin/view/ztcompany.html.php @@ -3,7 +3,7 @@ * The ztcomany view file of admin module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package admin * @version $Id$ diff --git a/module/api/control.php b/module/api/control.php index 6c10a1a171..19b1bfa7f1 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -3,7 +3,7 @@ * The control file of api of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id: control.php 5143 2013-07-15 06:11:59Z thanatos thanatos915@163.com $ diff --git a/module/api/lang/de.php b/module/api/lang/de.php index 3ad7b2fc62..8bc87e574b 100644 --- a/module/api/lang/de.php +++ b/module/api/lang/de.php @@ -3,7 +3,7 @@ * The api module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id: English.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/api/lang/en.php b/module/api/lang/en.php index 20aefb7498..bc93f58f88 100644 --- a/module/api/lang/en.php +++ b/module/api/lang/en.php @@ -3,7 +3,7 @@ * The api module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id: English.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php index 18a34a5571..198d7e614f 100644 --- a/module/api/lang/fr.php +++ b/module/api/lang/fr.php @@ -3,7 +3,7 @@ * The api module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id: English.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php index e49b961316..33b9194d1b 100755 --- a/module/api/lang/zh-cn.php +++ b/module/api/lang/zh-cn.php @@ -3,7 +3,7 @@ * The api module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id: zh-cn.php 5129 2013-07-15 00:16:07Z zhujinyonging@gmail.com $ diff --git a/module/api/lang/zh-tw.php b/module/api/lang/zh-tw.php index e56d998aee..f8c3aee086 100644 --- a/module/api/lang/zh-tw.php +++ b/module/api/lang/zh-tw.php @@ -3,7 +3,7 @@ * The api module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id: zh-tw.php 5129 2013-07-15 00:16:07Z zhujinyonging@gmail.com $ diff --git a/module/api/model.php b/module/api/model.php index 1206ffbf28..7ed1c45b05 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -3,7 +3,7 @@ * The model file of api module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package api * @version $Id$ diff --git a/module/api/view/create.html.php b/module/api/view/create.html.php index 7b8d29d638..cd76e60bb9 100644 --- a/module/api/view/create.html.php +++ b/module/api/view/create.html.php @@ -3,7 +3,7 @@ * The create view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: create.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/api/view/createlib.html.php b/module/api/view/createlib.html.php index 8e215817d9..1699aadaa2 100644 --- a/module/api/view/createlib.html.php +++ b/module/api/view/createlib.html.php @@ -3,7 +3,7 @@ * The createlib view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: createlib.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/api/view/createrelease.html.php b/module/api/view/createrelease.html.php index 25d8c8956d..b691c31f90 100644 --- a/module/api/view/createrelease.html.php +++ b/module/api/view/createrelease.html.php @@ -3,7 +3,7 @@ * The createlib view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: createlib.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/api/view/createstruct.html.php b/module/api/view/createstruct.html.php index 532907d95b..119ac488c9 100644 --- a/module/api/view/createstruct.html.php +++ b/module/api/view/createstruct.html.php @@ -3,7 +3,7 @@ * The create struct view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Thanatos * @package doc * @link http://www.zentao.net diff --git a/module/api/view/edit.html.php b/module/api/view/edit.html.php index 7afc810963..802be2454a 100644 --- a/module/api/view/edit.html.php +++ b/module/api/view/edit.html.php @@ -3,7 +3,7 @@ * The create view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: create.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/api/view/editlib.html.php b/module/api/view/editlib.html.php index 73baddb4b1..bad5910b99 100644 --- a/module/api/view/editlib.html.php +++ b/module/api/view/editlib.html.php @@ -3,7 +3,7 @@ * The createlib view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: createlib.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/api/view/editstruct.html.php b/module/api/view/editstruct.html.php index 2a44d81eb3..86228c3fbe 100644 --- a/module/api/view/editstruct.html.php +++ b/module/api/view/editstruct.html.php @@ -3,7 +3,7 @@ * The create struct view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Thanatos * @package doc * @link http://www.zentao.net diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php index 7ac4c80c56..0891b0228d 100644 --- a/module/api/view/index.html.php +++ b/module/api/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package doc * @version $Id$ diff --git a/module/api/view/releases.html.php b/module/api/view/releases.html.php index aca80bb3c8..8514dc3f13 100644 --- a/module/api/view/releases.html.php +++ b/module/api/view/releases.html.php @@ -3,7 +3,7 @@ * The index view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Thanatos * @package doc * @version $Id$ diff --git a/module/api/view/struct.html.php b/module/api/view/struct.html.php index 15d5f30b6c..dc4d3bb1cd 100644 --- a/module/api/view/struct.html.php +++ b/module/api/view/struct.html.php @@ -3,7 +3,7 @@ * The index view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Thanatos * @package doc * @version $Id$ diff --git a/module/automation/control.php b/module/automation/control.php index 8c7ad1eedf..54324120a4 100644 --- a/module/automation/control.php +++ b/module/automation/control.php @@ -3,7 +3,7 @@ * The control file of automation module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package automation * @version $Id: control.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ diff --git a/module/automation/lang/en.php b/module/automation/lang/en.php index 1353de470d..5843ff4239 100644 --- a/module/automation/lang/en.php +++ b/module/automation/lang/en.php @@ -3,7 +3,7 @@ * The automation module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package automation * @version $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $ diff --git a/module/automation/lang/zh-cn.php b/module/automation/lang/zh-cn.php index f128edee00..b8e53bdb02 100644 --- a/module/automation/lang/zh-cn.php +++ b/module/automation/lang/zh-cn.php @@ -3,7 +3,7 @@ * The automation module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package automation * @version $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $ diff --git a/module/automation/lang/zh-tw.php b/module/automation/lang/zh-tw.php index afc173fc3c..863e93b8cd 100644 --- a/module/automation/lang/zh-tw.php +++ b/module/automation/lang/zh-tw.php @@ -3,7 +3,7 @@ * The automation module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package automation * @version $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $ diff --git a/module/automation/model.php b/module/automation/model.php index 720c9b4b80..c7d7c9306f 100644 --- a/module/automation/model.php +++ b/module/automation/model.php @@ -3,7 +3,7 @@ * The model file of automation module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package automation * @version $Id: model.php 5148 2013-07-16 01:31:08Z chencongzhi520@gmail.com $ diff --git a/module/automation/view/browse.html.php b/module/automation/view/browse.html.php index b2ee1c9786..236065a73e 100644 --- a/module/automation/view/browse.html.php +++ b/module/automation/view/browse.html.php @@ -3,7 +3,7 @@ * The view file of automation module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package automation * @version $Id: view.html.php 2568 2012-02-09 06:56:35Z shiyangyangwork@yahoo.cn $ diff --git a/module/backup/control.php b/module/backup/control.php index 0f39f398d3..e7ab01797e 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -3,7 +3,7 @@ * The control file of backup of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package backup * @version $Id$ diff --git a/module/backup/model.php b/module/backup/model.php index f430dc6afa..f6d3432609 100644 --- a/module/backup/model.php +++ b/module/backup/model.php @@ -3,7 +3,7 @@ * The model file of backup module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package backup * @version $Id$ diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index 8097a4e1b7..4a642163ff 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -3,7 +3,7 @@ * The view file of backup module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package backup * @version $Id: view.html.php 2568 2012-02-09 06:56:35Z shiyangyangwork@yahoo.cn $ diff --git a/module/backup/view/setting.html.php b/module/backup/view/setting.html.php index 7e6773306b..51a396a289 100644 --- a/module/backup/view/setting.html.php +++ b/module/backup/view/setting.html.php @@ -3,7 +3,7 @@ * The setting view file of backup module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package backup * @version $Id$ diff --git a/module/block/config.php b/module/block/config.php index f633f2f1a8..1f5c129f0c 100644 --- a/module/block/config.php +++ b/module/block/config.php @@ -3,7 +3,7 @@ * The config file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/control.php b/module/block/control.php index 23bb4ac43e..7cf9174997 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -3,7 +3,7 @@ * The control file of block of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 48edd9f2e0..f235b97ef0 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -3,7 +3,7 @@ * The de file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 6346a414c7..0397b4bb95 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -3,7 +3,7 @@ * The en file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index cb5d1d043c..e09ccb64e9 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -3,7 +3,7 @@ * The fr file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index 8d0a89bde2..f707316e13 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -3,7 +3,7 @@ * The vi file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 28e4d7d9f4..860e6e794a 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -3,7 +3,7 @@ * The zh-cn file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 421aeb9ac0..d951f32b97 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -3,7 +3,7 @@ * The zh-tw file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/model.php b/module/block/model.php index c676ecb089..62fe91b209 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -3,7 +3,7 @@ * The model file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 5c46b3f9ff..766398cd3e 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -3,7 +3,7 @@ * The admin view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index afdab88b10..651437cc96 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -3,7 +3,7 @@ * The bug block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index becad6f076..3d44583e07 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -3,7 +3,7 @@ * The build block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index e794f2e14e..0aa2982753 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -4,7 +4,7 @@ * The case block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 0213f7c781..9746ce22e8 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -3,7 +3,7 @@ * The dashboard view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/executionblock.html.php b/module/block/view/executionblock.html.php index 6611c5feff..c85a231180 100644 --- a/module/block/view/executionblock.html.php +++ b/module/block/view/executionblock.html.php @@ -3,7 +3,7 @@ * The execution block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/executionoverviewblock.html.php b/module/block/view/executionoverviewblock.html.php index 3dec05c370..27a53c7423 100644 --- a/module/block/view/executionoverviewblock.html.php +++ b/module/block/view/executionoverviewblock.html.php @@ -3,7 +3,7 @@ * The execution overview block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Tingting Dai * @package block * @version $Id$ diff --git a/module/block/view/listblock.html.php b/module/block/view/listblock.html.php index 9e9cf211e4..ffdec20f5a 100644 --- a/module/block/view/listblock.html.php +++ b/module/block/view/listblock.html.php @@ -3,7 +3,7 @@ * The list block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/main.html.php b/module/block/view/main.html.php index 0cadfe729d..d90a21d363 100644 --- a/module/block/view/main.html.php +++ b/module/block/view/main.html.php @@ -3,7 +3,7 @@ * The main view file of block module of ZentaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/overviewblock.html.php b/module/block/view/overviewblock.html.php index 66bec1b5fb..dbe26251c2 100644 --- a/module/block/view/overviewblock.html.php +++ b/module/block/view/overviewblock.html.php @@ -3,7 +3,7 @@ * The overview block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package block * @version $Id$ diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php index 646a6bd57c..b5aa67d35f 100644 --- a/module/block/view/planblock.html.php +++ b/module/block/view/planblock.html.php @@ -3,7 +3,7 @@ * The plan block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php index 5feadbc6d8..af7ebb72b0 100644 --- a/module/block/view/printassigntomeblock.html.php +++ b/module/block/view/printassigntomeblock.html.php @@ -3,7 +3,7 @@ * The assigntome block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 148eb41cd0..3f8a4ee56a 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -3,7 +3,7 @@ * The product block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/productoverviewblock.html.php b/module/block/view/productoverviewblock.html.php index 9d7b18bb1b..09cc928472 100644 --- a/module/block/view/productoverviewblock.html.php +++ b/module/block/view/productoverviewblock.html.php @@ -3,7 +3,7 @@ * The overview block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package block * @version $Id$ diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php index 82d5bb893d..8da697047a 100644 --- a/module/block/view/productstatisticblock.html.php +++ b/module/block/view/productstatisticblock.html.php @@ -3,7 +3,7 @@ * The report block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package block * @version $Id$ diff --git a/module/block/view/publicform.html.php b/module/block/view/publicform.html.php index 537dd8e250..41e34f2a49 100644 --- a/module/block/view/publicform.html.php +++ b/module/block/view/publicform.html.php @@ -3,7 +3,7 @@ * The public form items of block of Zentao. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/qaoverviewblock.html.php b/module/block/view/qaoverviewblock.html.php index 347043424e..ed56235152 100644 --- a/module/block/view/qaoverviewblock.html.php +++ b/module/block/view/qaoverviewblock.html.php @@ -3,7 +3,7 @@ * The project overview block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Tingting Dai * @package block * @version $Id$ diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index f8e37278d5..8711281d04 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -3,7 +3,7 @@ * The release block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/requirementblock.html.php b/module/block/view/requirementblock.html.php index 2d64099f90..ff10aef7f1 100644 --- a/module/block/view/requirementblock.html.php +++ b/module/block/view/requirementblock.html.php @@ -3,7 +3,7 @@ * The requirement block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php index 91d1020917..b942bbc23a 100644 --- a/module/block/view/scrumlistblock.html.php +++ b/module/block/view/scrumlistblock.html.php @@ -3,7 +3,7 @@ * The project list block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php index cf05b83451..a58d28b896 100644 --- a/module/block/view/scrumoverviewblock.html.php +++ b/module/block/view/scrumoverviewblock.html.php @@ -3,7 +3,7 @@ * The scrum overview block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/scrumproductblock.html.php b/module/block/view/scrumproductblock.html.php index 5140e8146b..40b842fbe7 100644 --- a/module/block/view/scrumproductblock.html.php +++ b/module/block/view/scrumproductblock.html.php @@ -3,7 +3,7 @@ * The product overview block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php index d85f159714..f5bdfab4bc 100644 --- a/module/block/view/scrumroadmapblock.html.php +++ b/module/block/view/scrumroadmapblock.html.php @@ -3,7 +3,7 @@ * The roadmap view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: roadmap.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/block/view/scrumtestblock.html.php b/module/block/view/scrumtestblock.html.php index 09a283bba1..4f28fd1c7f 100644 --- a/module/block/view/scrumtestblock.html.php +++ b/module/block/view/scrumtestblock.html.php @@ -3,7 +3,7 @@ * The testtask block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/set.html.php b/module/block/view/set.html.php index 70b92e4475..d3eb313fff 100644 --- a/module/block/view/set.html.php +++ b/module/block/view/set.html.php @@ -3,7 +3,7 @@ * The set view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/setmodule.html.php b/module/block/view/setmodule.html.php index c4c858826a..6a5f75f892 100644 --- a/module/block/view/setmodule.html.php +++ b/module/block/view/setmodule.html.php @@ -3,7 +3,7 @@ * The setmodule view of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id: html.php 7488 2013-12-26 07:26:10Z zhujinyong $ diff --git a/module/block/view/sprintblock.html.php b/module/block/view/sprintblock.html.php index c3b79d19ce..32b55aa980 100644 --- a/module/block/view/sprintblock.html.php +++ b/module/block/view/sprintblock.html.php @@ -3,7 +3,7 @@ * The sprint block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/statisticblock.html.php b/module/block/view/statisticblock.html.php index c7357605de..d1e4befacc 100644 --- a/module/block/view/statisticblock.html.php +++ b/module/block/view/statisticblock.html.php @@ -3,7 +3,7 @@ * The report block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package block * @version $Id$ diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 68e9c7ece8..dcdf064b87 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -3,7 +3,7 @@ * The story block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 0b513de61b..795761def4 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -3,7 +3,7 @@ * The task block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 342abd3916..bffb631682 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -3,7 +3,7 @@ * The testtask block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 05772fa2fa..5cbf385323 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -3,7 +3,7 @@ * The todo block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php index 90238ebbb7..13ab4544d2 100644 --- a/module/block/view/todolist.html.php +++ b/module/block/view/todolist.html.php @@ -3,7 +3,7 @@ * The story block view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php index 1ddbb25f40..c7735e2aff 100644 --- a/module/block/view/welcome.html.php +++ b/module/block/view/welcome.html.php @@ -3,7 +3,7 @@ * The welcome view file of block module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package block * @version $Id$ diff --git a/module/branch/control.php b/module/branch/control.php index a5f2c22080..b42ee63b0c 100644 --- a/module/branch/control.php +++ b/module/branch/control.php @@ -3,7 +3,7 @@ * The control file of branch of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package branch * @version $Id$ diff --git a/module/branch/model.php b/module/branch/model.php index 6e87a07734..dbf7fac873 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -3,7 +3,7 @@ * The model file of branch module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package branch * @version $Id$ diff --git a/module/branch/view/batchedit.html.php b/module/branch/view/batchedit.html.php index 895310d75b..e293c9ce9a 100644 --- a/module/branch/view/batchedit.html.php +++ b/module/branch/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batchedit of branch module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package branch * @version $Id: batchedit.html.php 4903 2021-11-09 13:14:59Z hfz $ diff --git a/module/branch/view/create.html.php b/module/branch/view/create.html.php index 899dc015ac..cc68410c7f 100644 --- a/module/branch/view/create.html.php +++ b/module/branch/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of branch module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package branch * @version $Id$ diff --git a/module/branch/view/edit.html.php b/module/branch/view/edit.html.php index 69d6fcf4ee..c045fd6384 100644 --- a/module/branch/view/edit.html.php +++ b/module/branch/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of branch module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package branch * @version $Id$ diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php index 28a2027f52..749c01b408 100644 --- a/module/branch/view/manage.html.php +++ b/module/branch/view/manage.html.php @@ -3,7 +3,7 @@ * The manage view file of branch module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package branch * @version $Id$ diff --git a/module/bug/control.php b/module/bug/control.php index d28b6fc25f..963aa527e2 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -3,7 +3,7 @@ * The control file of bug currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: control.php 5107 2013-07-12 01:46:12Z chencongzhi520@gmail.com $ diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 1f24eae1ec..e8e26ed7e3 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -3,7 +3,7 @@ * The bug module german file of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: de.php 4536 2013-03-02 13:39:37Z wwccss $ diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index d8d7c8fd71..b1cba31e03 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -3,7 +3,7 @@ * The bug module English file of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: en.php 4536 2013-03-02 13:39:37Z wwccss $ diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index fce872856d..f0656367b8 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -3,7 +3,7 @@ * The bug module french file of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: fr.php 4536 2013-03-02 13:39:37Z wwccss $ diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index c61ed60d23..c77c47c11f 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -3,7 +3,7 @@ * The bug module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: zh-cn.php 4536 2013-03-02 13:39:37Z wwccss $ diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 3a4e4f26c6..9ac6af81b9 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -3,7 +3,7 @@ * The bug module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: zh-tw.php 4536 2013-03-02 13:39:37Z wwccss $ diff --git a/module/bug/model.php b/module/bug/model.php index 64c6001068..1a21378fb3 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3,7 +3,7 @@ * The model file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: model.php 5079 2013-07-10 00:44:34Z chencongzhi520@gmail.com $ @@ -938,10 +938,12 @@ class bugModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->setDefault('assignedDate', $now) + ->stripTags($this->config->bug->editor->assignto['id'], $this->config->allowedTags) ->remove('comment,showModule') ->join('mailto', ',') ->get(); + $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->assignto['id'], $this->post->uid); $this->dao->update(TABLE_BUG) ->data($bug) ->autoCheck() @@ -973,10 +975,12 @@ class bugModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->setDefault('assignedDate', $now) + ->stripTags($this->config->bug->editor->confirmbug['id'], $this->config->allowedTags) ->remove('comment') ->join('mailto', ',') ->get(); + $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->confirmbug['id'], $this->post->uid); $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->checkFlow()->where('id')->eq($bugID)->exec(); if(!dao::isError()) @@ -1044,8 +1048,10 @@ class bugModel extends model ->setDefault('resolvedDate', $now) ->setDefault('assignedTo', $oldBug->openedBy) ->removeIF($this->post->resolution != 'duplicate', 'duplicateBug') + ->stripTags($this->config->bug->editor->resolve['id'], $this->config->allowedTags) ->remove('files,labels') ->get(); + $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->resolve['id'], $this->post->uid); /* Set comment lang for alert error. */ $this->lang->bug->comment = $this->lang->comment; @@ -1319,6 +1325,7 @@ class bugModel extends model ->setDefault('lastEditedDate', $now) ->setDefault('activatedDate', $now) ->setDefault('activatedCount', (int)$oldBug->activatedCount) + ->stripTags($this->config->bug->editor->activate['id'], $this->config->allowedTags) ->add('id', $bugID) ->add('resolution', '') ->add('status', 'active') @@ -1334,6 +1341,7 @@ class bugModel extends model ->remove('comment,files,labels') ->get(); + $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->activate['id'], $this->post->uid); $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->checkFlow()->where('id')->eq((int)$bugID)->exec(); $this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec(); @@ -1380,9 +1388,11 @@ class bugModel extends model ->setDefault('lastEditedDate', $now) ->setDefault('closedBy', $this->app->user->account) ->setDefault('closedDate', $now) + ->stripTags($this->config->bug->editor->close['id'], $this->config->allowedTags) ->remove('comment') ->get(); + $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->close['id'], $this->post->uid); $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->checkFlow()->where('id')->eq((int)$bugID)->exec(); if($oldBug->execution) { diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php index 55f7eda56e..e2f5fce4da 100644 --- a/module/bug/view/activate.html.php +++ b/module/bug/view/activate.html.php @@ -3,7 +3,7 @@ * The activate file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: activate.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php index 454c943aad..32c73a6907 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -3,7 +3,7 @@ * The complete file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: complete.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php index 7d861c682a..fbf496252a 100644 --- a/module/bug/view/batchactivate.html.php +++ b/module/bug/view/batchactivate.html.php @@ -3,7 +3,7 @@ * The batch activate view of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package bug * @version $Id$ diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 17a5c284a1..c8972d9c1b 100755 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 985b4645c4..d2d2a25264 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit view of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package bug * @version $Id$ diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index ff5a3ab2e3..1088484bd1 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: browse.html.php 5102 2013-07-12 00:59:54Z chencongzhi520@gmail.com $ diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php index 6d2f80c941..0d48c90ce8 100644 --- a/module/bug/view/close.html.php +++ b/module/bug/view/close.html.php @@ -3,7 +3,7 @@ * The close file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: close.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php index 3d54a18561..24bdf535d4 100755 --- a/module/bug/view/confirmbug.html.php +++ b/module/bug/view/confirmbug.html.php @@ -3,7 +3,7 @@ * The confirm file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: resolve.html.php 1914 2011-06-24 10:11:25Z yidong@cnezsoft.com $ diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 50ee11aa13..bbe93e1786 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -3,7 +3,7 @@ * The create view of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: create.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 8716ea05fa..e3ad814810 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -3,7 +3,7 @@ * The edit file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: edit.html.php 4259 2013-01-24 05:49:40Z wyd621@gmail.com $ diff --git a/module/bug/view/export.html.php b/module/bug/view/export.html.php index 886943b648..8e9097039f 100755 --- a/module/bug/view/export.html.php +++ b/module/bug/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package task * @version $Id$ diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php index 7ead53687b..6f883c20ae 100644 --- a/module/bug/view/linkbugs.html.php +++ b/module/bug/view/linkbugs.html.php @@ -3,7 +3,7 @@ * The link bug view of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fei Chen * @package bug * @version $Id: linkbugs.html.php 4129 2016-03-08 09:00:12Z chenfei $ diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php index 24111bc15f..2fab4d15d6 100644 --- a/module/bug/view/report.html.php +++ b/module/bug/view/report.html.php @@ -3,7 +3,7 @@ * The report view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: report.html.php 4657 2013-04-17 02:01:26Z chencongzhi520@gmail.com $ diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 35d128ceae..e665c4c250 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -3,7 +3,7 @@ * The resolve file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: resolve.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/bug/view/sendmail.html.php b/module/bug/view/sendmail.html.php index bbc9fb1bd4..cd1c937ee2 100644 --- a/module/bug/view/sendmail.html.php +++ b/module/bug/view/sendmail.html.php @@ -3,7 +3,7 @@ * The mail file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: sendmail.html.php 4626 2013-04-10 05:34:36Z chencongzhi520@gmail.com $ diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 97c6003ba1..d76011e701 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -3,7 +3,7 @@ * The view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: view.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/build/control.php b/module/build/control.php index 1105dc34a3..9d2d1539f6 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -3,7 +3,7 @@ * The control file of build module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: control.php 4992 2013-07-03 07:21:59Z chencongzhi520@gmail.com $ diff --git a/module/build/lang/de.php b/module/build/lang/de.php index 8f68f4650b..c419e1a405 100644 --- a/module/build/lang/de.php +++ b/module/build/lang/de.php @@ -3,7 +3,7 @@ * The build module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 70ccd580f8..79cd2f6480 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -3,7 +3,7 @@ * The build module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php index c8bc850f73..5de93577db 100644 --- a/module/build/lang/fr.php +++ b/module/build/lang/fr.php @@ -3,7 +3,7 @@ * The build module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index 34647aec6d..c45863af1a 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -3,7 +3,7 @@ * The build module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php index 56f796195d..55b8b0934e 100644 --- a/module/build/lang/zh-tw.php +++ b/module/build/lang/zh-tw.php @@ -3,7 +3,7 @@ * The build module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/build/model.php b/module/build/model.php index a0e965c109..1eb43db7ef 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -3,7 +3,7 @@ * The model file of build module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: model.php 4970 2013-07-02 05:58:11Z wyd621@gmail.com $ diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index 996195e756..c080e0d04e 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -3,7 +3,7 @@ * The create view of build module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 7745491568..fa0d420eea 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of build module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index bdd39c2c5a..280121a0ae 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -3,7 +3,7 @@ * The link bug view of build module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package build * @version $Id: linkbug.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 56e906e431..560807515e 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of build module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package build * @version $Id: linkstory.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index b2dad81742..00bf20a69a 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -3,7 +3,7 @@ * The view file of build module's view method of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package build * @version $Id: view.html.php 4386 2013-02-19 07:37:45Z chencongzhi520@gmail.com $ diff --git a/module/caselib/control.php b/module/caselib/control.php index 8d31fe904e..d69393571a 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -3,7 +3,7 @@ * The control file of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package caselib * @version $Id: control.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $ diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php index a05ac03614..79dcbe057b 100644 --- a/module/caselib/lang/de.php +++ b/module/caselib/lang/de.php @@ -3,7 +3,7 @@ * The caselib module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php index 2044aa3fc7..652875e151 100644 --- a/module/caselib/lang/en.php +++ b/module/caselib/lang/en.php @@ -3,7 +3,7 @@ * The caselib module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php index 352f54cd62..ff7c33264c 100644 --- a/module/caselib/lang/fr.php +++ b/module/caselib/lang/fr.php @@ -3,7 +3,7 @@ * The caselib module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php index 114092a784..e54c946d4e 100644 --- a/module/caselib/lang/zh-cn.php +++ b/module/caselib/lang/zh-cn.php @@ -3,7 +3,7 @@ * The caselib module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/caselib/lang/zh-tw.php b/module/caselib/lang/zh-tw.php index dcdeee7314..e0043a96a7 100644 --- a/module/caselib/lang/zh-tw.php +++ b/module/caselib/lang/zh-tw.php @@ -3,7 +3,7 @@ * The caselib module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: zh-tw.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/caselib/model.php b/module/caselib/model.php index c087eb1974..54b4a8bb71 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -3,7 +3,7 @@ * The model file of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package caselib * @version $Id: model.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $ diff --git a/module/caselib/view/batchcreatecase.html.php b/module/caselib/view/batchcreatecase.html.php index 19bf7f080d..2f8d276ae8 100644 --- a/module/caselib/view/batchcreatecase.html.php +++ b/module/caselib/view/batchcreatecase.html.php @@ -3,7 +3,7 @@ * The batch create case view of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id$ diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 980fcde929..a148c5d427 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -3,7 +3,7 @@ * The library view file of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: library.html.php 5108 2013-07-12 01:59:04Z chencongzhi520@gmail.com $ diff --git a/module/caselib/view/create.html.php b/module/caselib/view/create.html.php index 7d028d4dd9..27d3f510e0 100644 --- a/module/caselib/view/create.html.php +++ b/module/caselib/view/create.html.php @@ -3,7 +3,7 @@ * The createlib view of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package caselib * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/caselib/view/createcase.html.php b/module/caselib/view/createcase.html.php index f1e4629c8c..1dcaed2fc1 100644 --- a/module/caselib/view/createcase.html.php +++ b/module/caselib/view/createcase.html.php @@ -3,7 +3,7 @@ * The create case view of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package caselib * @version $Id: createcase.html.php 4904 2013-06-26 05:37:45Z wyd621@gmail.com $ diff --git a/module/caselib/view/edit.html.php b/module/caselib/view/edit.html.php index 49fc7577f9..62d804818f 100644 --- a/module/caselib/view/edit.html.php +++ b/module/caselib/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package caselib * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/caselib/view/view.html.php b/module/caselib/view/view.html.php index 0bc7645556..6d8dac2186 100644 --- a/module/caselib/view/view.html.php +++ b/module/caselib/view/view.html.php @@ -3,7 +3,7 @@ * The view lib file of caselib module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package caselib * @version $Id: view.html.php 4141 2013-01-18 06:15:13Z zhujinyonging@gmail.com $ diff --git a/module/ci/control.php b/module/ci/control.php index 8c16c1ab1d..04066dbf69 100644 --- a/module/ci/control.php +++ b/module/ci/control.php @@ -3,7 +3,7 @@ * The control file of ci module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package product * @version $Id: ${FILE_NAME} 5144 2020/1/8 8:10 下午 chenqi@cnezsoft.com $ diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 60dd8fe3fa..0acb7d7bfa 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -3,7 +3,7 @@ * The common simplified chinese file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: de.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 17333a4d9a..13dc8ac023 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -3,7 +3,7 @@ * The common simplified chinese file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: en.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 1045cb2117..f1cecafc2f 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -3,7 +3,7 @@ * The common simplified chinese file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: fr.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 6e1bdaa473..48f7cd9b05 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -3,7 +3,7 @@ * The common simplified chinese file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 1ef0a50c8a..9e94116e75 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -3,7 +3,7 @@ * The common simplified chinese file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ diff --git a/module/common/model.php b/module/common/model.php index e1141b7368..5f392554d1 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -3,7 +3,7 @@ * The model file of common module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package common * @version $Id$ @@ -1920,7 +1920,7 @@ EOD; if(strtolower($key) == 'closeddate' && $value == '') continue; if(strtolower($key) == 'actualcloseddate' && $value == '') continue; - if(isset($old->$key) and $value != stripslashes($old->$key)) + if(array_key_exists($key, $old) and $value != stripslashes($old->$key)) { $diff = ''; if(substr_count($value, "\n") > 1 or diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php index 5ec1ec90dc..a1f24662b6 100644 --- a/module/common/view/customfield.html.php +++ b/module/common/view/customfield.html.php @@ -3,7 +3,7 @@ * The custom field view file of common module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package common * @version $Id$ diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index b0e795ee68..f21e8fb7ca 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -8,6 +8,7 @@ $defaultTheme = $webRoot . 'theme/default/'; $langTheme = $themeRoot . 'lang/' . $clientLang . '.css'; $clientTheme = $this->app->getClientTheme(); $onlybody = zget($_GET, 'onlybody', 'no'); +$defaultLang = array('zh-cn', 'zh-tw', 'en'); ?> @@ -31,7 +32,7 @@ $onlybody = zget($_GET, 'onlybody', 'no'); js::import($jsRoot . 'jquery/lib.js'); js::import($jsRoot . 'zui/min.js?t=' . $timestamp); - if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js?t=' . $timestamp); + if(!in_array($clientLang, $defaultLang)) js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js?t=' . $timestamp); js::import($jsRoot . 'my.full.js?t=' . $timestamp); } @@ -41,7 +42,7 @@ $onlybody = zget($_GET, 'onlybody', 'no'); if(!file_exists($this->app->getThemeRoot() . 'default/' . $this->cookie->lang . '.' . $this->cookie->theme . '.css')) $minCssFile = $defaultTheme . 'en.' . $this->cookie->theme . '.css'; css::import($minCssFile); js::import($jsRoot . 'all.js'); - if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js'); + if(!in_array($clientLang, $defaultLang)) js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js'); } if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css'); diff --git a/module/company/control.php b/module/company/control.php index 17010e0d32..346fb6865c 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -3,7 +3,7 @@ * The control file of company module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: control.php 5100 2013-07-12 00:25:23Z zhujinyonging@gmail.com $ diff --git a/module/company/lang/de.php b/module/company/lang/de.php index 5da8625db2..6748c728b3 100644 --- a/module/company/lang/de.php +++ b/module/company/lang/de.php @@ -3,7 +3,7 @@ * The company module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: en.php 4714 2013-05-02 08:10:58Z chencongzhi520@gmail.com $ diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 54be6c1852..5f2f65a55b 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -3,7 +3,7 @@ * The company module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: en.php 4714 2013-05-02 08:10:58Z chencongzhi520@gmail.com $ diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php index ac66b9a2dc..762861ce6f 100644 --- a/module/company/lang/fr.php +++ b/module/company/lang/fr.php @@ -3,7 +3,7 @@ * The company module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: en.php 4714 2013-05-02 08:10:58Z chencongzhi520@gmail.com $ diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index 23b1c0e37a..6dd35e9ee4 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -3,7 +3,7 @@ * The company module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: zh-cn.php 4714 2013-05-02 08:10:58Z chencongzhi520@gmail.com $ diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php index 2730969001..b71c23c797 100644 --- a/module/company/lang/zh-tw.php +++ b/module/company/lang/zh-tw.php @@ -3,7 +3,7 @@ * The company module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: zh-tw.php 4714 2013-05-02 08:10:58Z chencongzhi520@gmail.com $ diff --git a/module/company/model.php b/module/company/model.php index be7f081894..4c98aa2076 100644 --- a/module/company/model.php +++ b/module/company/model.php @@ -3,7 +3,7 @@ * The model file of company module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: model.php 5086 2013-07-10 02:25:22Z wyd621@gmail.com $ diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 1dbbf15f06..93faef8277 100755 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of product dept of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index f8d518eed8..d61d57213f 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -3,7 +3,7 @@ * The action->dynamic view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $ diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index 2acb543854..6f518c98d9 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of company module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: edit.html.php 4713 2013-05-02 08:04:38Z chencongzhi520@gmail.com $ diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php index 2809e684b8..7d1364c06c 100644 --- a/module/company/view/view.html.php +++ b/module/company/view/view.html.php @@ -3,7 +3,7 @@ * The view view of company module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package company * @version $Id: edit.html.php 4488 2013-02-27 02:54:49Z chencongzhi520@gmail.com $ diff --git a/module/compile/control.php b/module/compile/control.php index aa81b14e1d..8c37b3a7b6 100644 --- a/module/compile/control.php +++ b/module/compile/control.php @@ -3,7 +3,7 @@ * The control file of compile of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package compile * @version $Id$ diff --git a/module/compile/model.php b/module/compile/model.php index 83c5d0ab22..6cb2376f93 100644 --- a/module/compile/model.php +++ b/module/compile/model.php @@ -3,7 +3,7 @@ * The model file of compile module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package compile * @version $Id$ diff --git a/module/compile/view/browse.html.php b/module/compile/view/browse.html.php index 5dd9c2a77d..0ddae35387 100644 --- a/module/compile/view/browse.html.php +++ b/module/compile/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of compile module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package compile * @version $Id$ diff --git a/module/compile/view/logs.html.php b/module/compile/view/logs.html.php index 4b5e528505..52655ee355 100644 --- a/module/compile/view/logs.html.php +++ b/module/compile/view/logs.html.php @@ -3,7 +3,7 @@ * The browse view file of compile module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package compile * @version $Id$ diff --git a/module/convert/control.php b/module/convert/control.php index b92c713b29..b1c718595d 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -3,7 +3,7 @@ * The control file of convert currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: control.php 4976 2013-07-02 08:15:31Z wyd621@gmail.com $ diff --git a/module/convert/converter/bugfree.php b/module/convert/converter/bugfree.php index 43f4a6dfe1..7247ff25b4 100644 --- a/module/convert/converter/bugfree.php +++ b/module/convert/converter/bugfree.php @@ -3,7 +3,7 @@ * The baisc model file of bugfree convert of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: bugfree.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/converter/bugfree1.php b/module/convert/converter/bugfree1.php index e77262a8da..4eca8c6e35 100644 --- a/module/convert/converter/bugfree1.php +++ b/module/convert/converter/bugfree1.php @@ -3,7 +3,7 @@ * The model file of bugfree version 1 convert of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: bugfree1.php 5028 2013-07-06 02:59:41Z wyd621@gmail.com $ diff --git a/module/convert/converter/bugfree2.php b/module/convert/converter/bugfree2.php index 26e7ebd6ac..899a2139bc 100644 --- a/module/convert/converter/bugfree2.php +++ b/module/convert/converter/bugfree2.php @@ -3,7 +3,7 @@ * The model file of bugfree2 convert of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: bugfree2.php 5028 2013-07-06 02:59:41Z wyd621@gmail.com $ diff --git a/module/convert/converter/redmine.php b/module/convert/converter/redmine.php index 4ed5d3c50c..94f2dd1b62 100644 --- a/module/convert/converter/redmine.php +++ b/module/convert/converter/redmine.php @@ -3,7 +3,7 @@ * The baisc model file of bugfree convert of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package convert * @version $Id $ diff --git a/module/convert/converter/redmine1.1.php b/module/convert/converter/redmine1.1.php index 7114f3ebf9..6c2962f9b8 100644 --- a/module/convert/converter/redmine1.1.php +++ b/module/convert/converter/redmine1.1.php @@ -3,7 +3,7 @@ * The model file of redmine convert of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package convert * @version $Id $ diff --git a/module/convert/lang/de.php b/module/convert/lang/de.php index 5dd7c2af27..2e425f19ac 100644 --- a/module/convert/lang/de.php +++ b/module/convert/lang/de.php @@ -3,7 +3,7 @@ * The convert module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index b28d08d0f9..61dd51bee7 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -3,7 +3,7 @@ * The convert module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/lang/fr.php b/module/convert/lang/fr.php index b7da15239b..6bd0ff5491 100644 --- a/module/convert/lang/fr.php +++ b/module/convert/lang/fr.php @@ -3,7 +3,7 @@ * The convert module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index 4893ba7692..7194aefbb4 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -3,7 +3,7 @@ * The convert module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php index 0d4da243f2..125b011207 100644 --- a/module/convert/lang/zh-tw.php +++ b/module/convert/lang/zh-tw.php @@ -3,7 +3,7 @@ * The convert module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/model.php b/module/convert/model.php index 9f5b684fa8..8ad71afe3d 100644 --- a/module/convert/model.php +++ b/module/convert/model.php @@ -3,7 +3,7 @@ * The model file of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: model.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/checkconfig.html.php b/module/convert/view/checkconfig.html.php index a678a52b47..b48d5d81cc 100644 --- a/module/convert/view/checkconfig.html.php +++ b/module/convert/view/checkconfig.html.php @@ -3,7 +3,7 @@ * The html template file of check config method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: checkconfig.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/convertjira.html.php b/module/convert/view/convertjira.html.php index 35d3bcd4b6..777c9c4300 100644 --- a/module/convert/view/convertjira.html.php +++ b/module/convert/view/convertjira.html.php @@ -3,7 +3,7 @@ * The html template file of execute method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: execute.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/execute.html.php b/module/convert/view/execute.html.php index 972bda8c07..7add3b83a2 100644 --- a/module/convert/view/execute.html.php +++ b/module/convert/view/execute.html.php @@ -3,7 +3,7 @@ * The html template file of execute method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: execute.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/importnotice.html.php b/module/convert/view/importnotice.html.php index 094d0887c1..4ca8c268ea 100644 --- a/module/convert/view/importnotice.html.php +++ b/module/convert/view/importnotice.html.php @@ -3,7 +3,7 @@ * The html template file of importNotice method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: execute.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/index.html.php b/module/convert/view/index.html.php index eb2fb5860b..a3ceef8d5e 100644 --- a/module/convert/view/index.html.php +++ b/module/convert/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/initjirauser.html.php b/module/convert/view/initjirauser.html.php index a3164f8ee3..fc256d97f7 100644 --- a/module/convert/view/initjirauser.html.php +++ b/module/convert/view/initjirauser.html.php @@ -3,7 +3,7 @@ * The init jira user view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/convert/view/mapjira2zentao.html.php b/module/convert/view/mapjira2zentao.html.php index 47a9d55006..4de55bd426 100644 --- a/module/convert/view/mapjira2zentao.html.php +++ b/module/convert/view/mapjira2zentao.html.php @@ -3,7 +3,7 @@ * The html template file of importNotice method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: execute.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/selectsource.html.php b/module/convert/view/selectsource.html.php index ad0722b725..398a399226 100644 --- a/module/convert/view/selectsource.html.php +++ b/module/convert/view/selectsource.html.php @@ -3,7 +3,7 @@ * The html template file of select source method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: selectsource.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/convert/view/setconfig.html.php b/module/convert/view/setconfig.html.php index c36a2d4e64..915ea05024 100644 --- a/module/convert/view/setconfig.html.php +++ b/module/convert/view/setconfig.html.php @@ -3,7 +3,7 @@ * The html template file of setconfig method of convert module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package convert * @version $Id: setconfig.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/cron/control.php b/module/cron/control.php index 71f1a21e88..7b863918b3 100644 --- a/module/cron/control.php +++ b/module/cron/control.php @@ -3,7 +3,7 @@ * The control file of cron of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package cron * @version $Id$ diff --git a/module/cron/model.php b/module/cron/model.php index e857b4dcca..ef1ec7a580 100644 --- a/module/cron/model.php +++ b/module/cron/model.php @@ -3,7 +3,7 @@ * The model file of cron module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package cron * @version $Id$ diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php index afed61d995..d499fd283f 100644 --- a/module/cron/view/create.html.php +++ b/module/cron/view/create.html.php @@ -3,7 +3,7 @@ * The index view file of cron module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package cron * @version $Id$ diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php index 24b6207096..3ebcd0dc73 100644 --- a/module/cron/view/edit.html.php +++ b/module/cron/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of cron module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package cron * @version $Id$ diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php index bedf432683..494f5cc6d8 100644 --- a/module/cron/view/index.html.php +++ b/module/cron/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of cron module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package cron * @version $Id$ diff --git a/module/cron/view/openprocess.html.php b/module/cron/view/openprocess.html.php index bfae38f650..eccbe946d2 100644 --- a/module/cron/view/openprocess.html.php +++ b/module/cron/view/openprocess.html.php @@ -3,7 +3,7 @@ * The openprocess view file of cron module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package cron * @version $Id$ diff --git a/module/custom/control.php b/module/custom/control.php index b3c48cc761..46ac68f510 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -3,7 +3,7 @@ * The control file of custom of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package custom * @version $Id$ diff --git a/module/custom/model.php b/module/custom/model.php index 0948715a05..2ff04d5438 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -3,7 +3,7 @@ * The model file of custom module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package custom * @version $Id$ diff --git a/module/custom/view/ajaxmenu.html.php b/module/custom/view/ajaxmenu.html.php index 3b596b6794..08a7bf54de 100644 --- a/module/custom/view/ajaxmenu.html.php +++ b/module/custom/view/ajaxmenu.html.php @@ -3,7 +3,7 @@ * The menu view of custom module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package user * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php index f8c4ad0857..5327fdae85 100644 --- a/module/custom/view/browsestoryconcept.html.php +++ b/module/custom/view/browsestoryconcept.html.php @@ -3,7 +3,7 @@ * The html template file of setstoryconcept method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package ZenTaoPMS * @version $Id: browsestoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $ diff --git a/module/custom/view/editstoryconcept.html.php b/module/custom/view/editstoryconcept.html.php index 8fc0d95713..3625970fc1 100644 --- a/module/custom/view/editstoryconcept.html.php +++ b/module/custom/view/editstoryconcept.html.php @@ -3,7 +3,7 @@ * The html template file of setstoryconcept method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package ZenTaoPMS * @version $Id: setstoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $ diff --git a/module/custom/view/execution.html.php b/module/custom/view/execution.html.php index 5d655f9ec7..24d7b5a58c 100644 --- a/module/custom/view/execution.html.php +++ b/module/custom/view/execution.html.php @@ -2,7 +2,7 @@ /** * The execution view file of custom module of ZenTaoPMS. * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Liyuchun * @package custom * @version $Id$ diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php index 5dd266ad68..fbac50f2db 100644 --- a/module/custom/view/flow.html.php +++ b/module/custom/view/flow.html.php @@ -3,7 +3,7 @@ * The html template file of deny method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/custom/view/kanban.html.php b/module/custom/view/kanban.html.php index 787c1b1eea..495bef43ea 100644 --- a/module/custom/view/kanban.html.php +++ b/module/custom/view/kanban.html.php @@ -2,7 +2,7 @@ /** * The kanban view file of custom module of ZenTaoPMS. * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Liyuchun * @package custom * @version $Id$ diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index d5a864adcb..2d480ed65c 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -3,7 +3,7 @@ * The set view file of custom module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Tingting Dai * @package custom * @version $Id$ diff --git a/module/custom/view/product.html.php b/module/custom/view/product.html.php index 994f4158d7..bcdd452301 100644 --- a/module/custom/view/product.html.php +++ b/module/custom/view/product.html.php @@ -2,7 +2,7 @@ /** * The product view file of custom module of ZenTaoPMS. * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Liyuchun * @package custom * @version $Id$ diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index c2ecd276fc..eb83cf9aa6 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -3,7 +3,7 @@ * The required view file of custom module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package custom * @version $Id$ @@ -16,6 +16,7 @@
custom->requiredModules); foreach($config->custom->requiredModules as $requiredModule) { $requiredModuleName = zget($lang->custom->moduleName, $requiredModule, $lang->$requiredModule->common); diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php index 1de99377c4..5f44354bf4 100644 --- a/module/custom/view/score.html.php +++ b/module/custom/view/score.html.php @@ -2,7 +2,7 @@ /** * The score view file of custom module of ZenTaoPMS. * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Memory * @package custom * @version $Id$ diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index b59712c35d..b13a894ab6 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -3,7 +3,7 @@ * The set view file of custom module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package custom * @version $Id$ diff --git a/module/custom/view/setstoryconcept.html.php b/module/custom/view/setstoryconcept.html.php index dd083b92f9..c9f61605c2 100644 --- a/module/custom/view/setstoryconcept.html.php +++ b/module/custom/view/setstoryconcept.html.php @@ -3,7 +3,7 @@ * The html template file of setstoryconcept method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package ZenTaoPMS * @version $Id: setstoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $ diff --git a/module/custom/view/timezone.html.php b/module/custom/view/timezone.html.php index 3f802adc1e..a7669e26da 100644 --- a/module/custom/view/timezone.html.php +++ b/module/custom/view/timezone.html.php @@ -3,7 +3,7 @@ * The timezone view file of custom module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package custom * @version $Id$ diff --git a/module/custom/view/working.html.php b/module/custom/view/working.html.php index 52c08d0833..888e38736f 100644 --- a/module/custom/view/working.html.php +++ b/module/custom/view/working.html.php @@ -3,7 +3,7 @@ * The set view file of custom module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Tingting Dai * @package custom * @version $Id$ diff --git a/module/dept/control.php b/module/dept/control.php index 4d1ab141ba..5a9be94276 100644 --- a/module/dept/control.php +++ b/module/dept/control.php @@ -3,7 +3,7 @@ * The control file of dept module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: control.php 4157 2013-01-20 07:09:42Z wwccss $ diff --git a/module/dept/lang/de.php b/module/dept/lang/de.php index da757d0565..0c0ccdf366 100644 --- a/module/dept/lang/de.php +++ b/module/dept/lang/de.php @@ -3,7 +3,7 @@ * The dept module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index fb11074f13..92d050e15e 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -3,7 +3,7 @@ * The dept module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/dept/lang/fr.php b/module/dept/lang/fr.php index b098cd76c8..c5ee0332a8 100644 --- a/module/dept/lang/fr.php +++ b/module/dept/lang/fr.php @@ -3,7 +3,7 @@ * The dept module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/dept/lang/zh-cn.php b/module/dept/lang/zh-cn.php index 3073c19e25..a3f4089e90 100644 --- a/module/dept/lang/zh-cn.php +++ b/module/dept/lang/zh-cn.php @@ -3,7 +3,7 @@ * The dept module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/dept/lang/zh-tw.php b/module/dept/lang/zh-tw.php index 2ca09b5eb7..ffa1e9266b 100644 --- a/module/dept/lang/zh-tw.php +++ b/module/dept/lang/zh-tw.php @@ -3,7 +3,7 @@ * The dept module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/dept/model.php b/module/dept/model.php index ae8d912786..f85ae68a9c 100644 --- a/module/dept/model.php +++ b/module/dept/model.php @@ -3,7 +3,7 @@ * The model file of dept module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: model.php 4210 2013-01-22 01:06:12Z zhujinyonging@gmail.com $ diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php index 8a7eaf808c..ed75260e41 100644 --- a/module/dept/view/browse.html.php +++ b/module/dept/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of dept module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dept * @version $Id: browse.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php index aef6145c96..68c8938578 100644 --- a/module/dept/view/edit.html.php +++ b/module/dept/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of dept module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package dept * @version $Id: edit.html.php 4795 2013-06-04 05:59:58Z zhujinyonging@gmail.com $ diff --git a/module/design/control.php b/module/design/control.php index d7c7a47295..728eb2b4d6 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -3,7 +3,7 @@ * The control file of design module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: control.php 5107 2020-09-02 09:46:12Z tianshujie@easycorp.ltd $ diff --git a/module/design/lang/de.php b/module/design/lang/de.php index 27564bc73a..7641a2c3fd 100644 --- a/module/design/lang/de.php +++ b/module/design/lang/de.php @@ -3,7 +3,7 @@ * The English file of design module. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: en.php 4729 2020-09-01 07:53:55Z tianshujie@easycorp.ltd $ diff --git a/module/design/lang/en.php b/module/design/lang/en.php index 8aba9b5c9f..595098ea3f 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -3,7 +3,7 @@ * The English file of design module. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: en.php 4729 2020-09-01 07:53:55Z tianshujie@easycorp.ltd $ diff --git a/module/design/lang/fr.php b/module/design/lang/fr.php index 27564bc73a..7641a2c3fd 100644 --- a/module/design/lang/fr.php +++ b/module/design/lang/fr.php @@ -3,7 +3,7 @@ * The English file of design module. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: en.php 4729 2020-09-01 07:53:55Z tianshujie@easycorp.ltd $ diff --git a/module/design/lang/vi.php b/module/design/lang/vi.php index 27564bc73a..7641a2c3fd 100644 --- a/module/design/lang/vi.php +++ b/module/design/lang/vi.php @@ -3,7 +3,7 @@ * The English file of design module. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: en.php 4729 2020-09-01 07:53:55Z tianshujie@easycorp.ltd $ diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index f98c52a288..d96bd18f15 100644 --- a/module/design/lang/zh-cn.php +++ b/module/design/lang/zh-cn.php @@ -3,7 +3,7 @@ * The zh-cn file of design module. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: zh-cn.php 4729 2020-09-01 07:53:55Z tianshujie@easycorp.ltd $ diff --git a/module/design/lang/zh-tw.php b/module/design/lang/zh-tw.php index 4f1c051d9a..a18dd3a00d 100644 --- a/module/design/lang/zh-tw.php +++ b/module/design/lang/zh-tw.php @@ -3,7 +3,7 @@ * The zh-tw file of design module. * * @copyright Copyright 2009-2020 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: zh-tw.php 4729 2020-09-01 07:53:55Z tianshujie@easycorp.ltd $ diff --git a/module/design/model.php b/module/design/model.php index 4a83455ffb..05ecc5863f 100644 --- a/module/design/model.php +++ b/module/design/model.php @@ -3,7 +3,7 @@ * The model file of design module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: model.php 5107 2020-09-02 09:46:12Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/assignto.html.php b/module/design/view/assignto.html.php index aa68967212..37b343a0ed 100644 --- a/module/design/view/assignto.html.php +++ b/module/design/view/assignto.html.php @@ -3,7 +3,7 @@ * The assignTo of design module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: assignto.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/batchcreate.html.php b/module/design/view/batchcreate.html.php index 73a1245522..5925f29608 100644 --- a/module/design/view/batchcreate.html.php +++ b/module/design/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batchCreate view of design module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: batchcreate.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php index 7ebc91caec..700a2b847e 100644 --- a/module/design/view/browse.html.php +++ b/module/design/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of design module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: browse.html.php 5102 2020-09-03 10:59:54Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php index 4a0be47622..42f099d79d 100644 --- a/module/design/view/create.html.php +++ b/module/design/view/create.html.php @@ -3,7 +3,7 @@ * The create view of design module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: create.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php index 78a8c1367b..42d3108719 100644 --- a/module/design/view/edit.html.php +++ b/module/design/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of design module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: edit.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/linkcommit.html.php b/module/design/view/linkcommit.html.php index d82820ee49..d6b5517f4a 100644 --- a/module/design/view/linkcommit.html.php +++ b/module/design/view/linkcommit.html.php @@ -3,7 +3,7 @@ * The linkCommit view of design module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: linkcommit.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php index 1f8ded1892..777eca48e3 100644 --- a/module/design/view/view.html.php +++ b/module/design/view/view.html.php @@ -3,7 +3,7 @@ * The view of design module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: view.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/design/view/viewcommit.html.php b/module/design/view/viewcommit.html.php index 052201b658..b9fee4e330 100644 --- a/module/design/view/viewcommit.html.php +++ b/module/design/view/viewcommit.html.php @@ -3,7 +3,7 @@ * The viewCommit view of design module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package design * @version $Id: viewcommit.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $ diff --git a/module/dev/view/editor.html.php b/module/dev/view/editor.html.php index f3ddc4380e..c9d90de34e 100644 --- a/module/dev/view/editor.html.php +++ b/module/dev/view/editor.html.php @@ -3,7 +3,7 @@ * The editor view file of dev module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package dev * @version $Id$ diff --git a/module/dev/view/translate.html.php b/module/dev/view/translate.html.php index 08cb55fd89..2cb899bf20 100644 --- a/module/dev/view/translate.html.php +++ b/module/dev/view/translate.html.php @@ -3,7 +3,7 @@ * The translate view file of dev module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package dev * @version $Id$ diff --git a/module/doc/control.php b/module/doc/control.php old mode 100644 new mode 100755 index 80c7c0b55a..101676c2de --- a/module/doc/control.php +++ b/module/doc/control.php @@ -3,7 +3,7 @@ * The control file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: control.php 933 2010-07-06 06:53:40Z wwccss $ @@ -792,6 +792,28 @@ class doc extends control return print($select); } + /** + * Ajax get docs by lib. + * + * @param int $libID + * @access public + * @return void + */ + public function ajaxGetDocs($libID) + { + if(!$libID) return print(html::select('doc', '', '', "class='form-control chosen'")); + + $docIdList = $this->doc->getPrivDocs($libID, 0); + $docs = $this->dao->select('id, title')->from(TABLE_DOC) + ->where('lib')->eq($libID) + ->andWhere('deleted')->eq(0) + ->andWhere('id')->in($docIdList) + ->orderBy('`order` asc') + ->fetchPairs(); + + return print(html::select('doc', $docs, '', "class='form-control chosen'")); + } + /** * Ajax save draft. * diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 92dca380b6..74b59592aa 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -3,7 +3,7 @@ * The doc module english file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: en.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index ac26a6ddbb..c615e7a983 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -3,7 +3,7 @@ * The doc module english file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: en.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 4e30f2e26b..3af3173408 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -3,7 +3,7 @@ * The doc module english file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: en.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 1fd47b0c4d..c3bbff2e37 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -3,7 +3,7 @@ * The doc module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: zh-cn.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 2e9ea61fdc..e70d72133c 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -3,7 +3,7 @@ * The doc module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/doc/model.php b/module/doc/model.php index 3d232a5524..a225a3f2ee 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -3,7 +3,7 @@ * The model file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package doc * @version $Id: model.php 881 2010-06-22 06:50:32Z chencongzhi520 $ diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php index 000ce20421..9b7209c4de 100644 --- a/module/doc/view/alllibs.html.php +++ b/module/doc/view/alllibs.html.php @@ -3,7 +3,7 @@ * The allLibs view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package doc * @version $Id$ diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 5e242d730b..1d09883c89 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package lib * @version $Id: browse.html.php 958 2010-07-22 08:09:42Z wwccss $ diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index b2c0fa95ba..393cefc89d 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -102,7 +102,7 @@ } elseif($doc->contentType == 'markdown') { - echo ""; + echo ""; } else { @@ -295,7 +295,7 @@ $(function() { var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false}); - simplemde.value(markdownText); + simplemde.value(String(markdownText)); simplemde.togglePreview(); $('#content .CodeMirror .editor-preview a').attr('target', '_blank'); diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 55190bbf02..6be6f00aaa 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -3,7 +3,7 @@ * The create view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: create.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index b0a84345ee..0c78b22518 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -3,7 +3,7 @@ * The createlib view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: createlib.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index 2f2f1fa464..b9c8706261 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: edit.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index b7fbea8ac6..67fb26cb1e 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -3,7 +3,7 @@ * The editlib file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: editlib.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index f3861e2316..293176cd59 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package doc * @version $Id$ diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 9798313fec..2a0be66c0e 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -3,7 +3,7 @@ * The objectLibs view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package doc * @version $Id$ diff --git a/module/doc/view/selectlibtype.html.php b/module/doc/view/selectlibtype.html.php index 2659207437..8c92315749 100644 --- a/module/doc/view/selectlibtype.html.php +++ b/module/doc/view/selectlibtype.html.php @@ -3,7 +3,7 @@ * The select lib type view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.zentao.net) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package doc * @version $Id: selectlibtype.html.php 958 2021-09-3 17:09:42Z liyuchun $ diff --git a/module/doc/view/sendmail.html.php b/module/doc/view/sendmail.html.php index df974bebde..179eb93b68 100644 --- a/module/doc/view/sendmail.html.php +++ b/module/doc/view/sendmail.html.php @@ -3,7 +3,7 @@ * The sendmail file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package doc * @version $Id: sendmail.html.php 3717 2020-11-03 15:35:07Z tianshujie@easycorp.ltd $ diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php index 8c229e8471..df7335f0bd 100644 --- a/module/doc/view/showfiles.html.php +++ b/module/doc/view/showfiles.html.php @@ -3,7 +3,7 @@ * The showFiles view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package doc * @version $Id$ diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php index a153373de7..e7941a936b 100644 --- a/module/doc/view/tablecontents.html.php +++ b/module/doc/view/tablecontents.html.php @@ -3,7 +3,7 @@ * The table contents view file of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fangzhou Hu * @package doc * @version $Id$ diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 14d3f0e80a..c3776fa5e3 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -3,7 +3,7 @@ * The view of doc module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package doc * @version $Id: view.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ @@ -116,7 +116,7 @@ js::set('docID', $doc->id); } elseif($doc->contentType == 'markdown') { - echo ""; + echo ""; } else { @@ -249,7 +249,7 @@ js::set('docID', $doc->id); $(function() { var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false}); - simplemde.value(markdownText); + simplemde.value(String(markdownText)); simplemde.togglePreview(); $('#content .CodeMirror .editor-preview a').attr('target', '_blank'); diff --git a/module/entry/control.php b/module/entry/control.php index a5aa18d2ef..261ebf01a1 100644 --- a/module/entry/control.php +++ b/module/entry/control.php @@ -3,7 +3,7 @@ * The control file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/entry/model.php b/module/entry/model.php index 92e2cd3107..a5fe920606 100644 --- a/module/entry/model.php +++ b/module/entry/model.php @@ -3,7 +3,7 @@ * The model file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/entry/view/browse.html.php b/module/entry/view/browse.html.php index 3dc711095a..62bdc8474c 100644 --- a/module/entry/view/browse.html.php +++ b/module/entry/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php index fcf8960f12..aed33df256 100644 --- a/module/entry/view/create.html.php +++ b/module/entry/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php index ea51acba64..67db9213aa 100644 --- a/module/entry/view/edit.html.php +++ b/module/entry/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/entry/view/header.html.php b/module/entry/view/header.html.php index ba427ff7ec..e98ee5180c 100644 --- a/module/entry/view/header.html.php +++ b/module/entry/view/header.html.php @@ -3,7 +3,7 @@ * The header view file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/entry/view/log.html.php b/module/entry/view/log.html.php index 2e54673f9c..d2d02d535b 100644 --- a/module/entry/view/log.html.php +++ b/module/entry/view/log.html.php @@ -3,7 +3,7 @@ * The log view file of entry module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package entry * @version $Id$ diff --git a/module/execution/control.php b/module/execution/control.php index 477a68ad5d..ac8760f403 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3820,17 +3820,18 @@ class execution extends control * @param string $browseType * @param string $groupBy * @param string $from execution|RD + * @param string $searchValue * @access public * @return array */ - public function ajaxUpdateKanban($executionID = 0, $enterTime = '', $browseType = '', $groupBy = '', $from = 'execution') + public function ajaxUpdateKanban($executionID = 0, $enterTime = '', $browseType = '', $groupBy = '', $from = 'execution', $searchValue = '') { $enterTime = date('Y-m-d H:i:s', $enterTime); $lastEditedTime = $this->dao->select("max(lastEditedTime) as lastEditedTime")->from(TABLE_KANBANLANE)->where('execution')->eq($executionID)->fetch('lastEditedTime'); - if($lastEditedTime > $enterTime or $groupBy != 'default') + if($lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue)) { - $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy); + $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy, $searchValue); return print(json_encode($kanbanGroup)); } } diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css index bb8b8d5bbd..8c3aff303c 100644 --- a/module/execution/css/kanban.css +++ b/module/execution/css/kanban.css @@ -110,3 +110,7 @@ #mainMenu .divider {margin: 10px} .modal-header {padding: 15px 0;} +#rdKanbanSearch.input-group {float: left; width: min-content;} +#rdKanbanSearchInput {width: 150px;} +#rdSearchBox {display: none; width: 150px;} +.btn-link.querybox-toggle {background-color: rgba(0,0,0,0);} diff --git a/module/execution/css/taskkanban.css b/module/execution/css/taskkanban.css index 0127f0157c..166278d2f0 100644 --- a/module/execution/css/taskkanban.css +++ b/module/execution/css/taskkanban.css @@ -54,7 +54,7 @@ #type_chosen .icon-kanban {padding-right: 10px; font-size: 15px;} .dropdown-menu a {text-align: left;} -.scrollbar-hover {max-height: 2000px; overflow: scroll !important;} +.scrollbar-hover {overflow: scroll !important;} .c-type {width: 150px !important; overflow: unset;} .c-group {width: 190px !important; overflow: unset;} .c-type {margin-left: 0px !important;} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 5c8a072197..26ecb547fd 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -478,7 +478,8 @@ function renderStoryItem(item, $item, col) .attr('href', $.createLink('story', 'view', 'storyID=' + item.id + '&version=0¶m=' + execution.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '95%'); $title.appendTo($item); } - $title.attr('title', item.title).find('.text').text(item.title); + var title = rdSearchValue != '' ? "" + item.title.replaceAll(rdSearchValue, "" + rdSearchValue + "") + "": "" + item.title + ""; + $title.attr('title', item.title).find('.text').replaceWith(title); } if(scaleSize <= 2) @@ -542,7 +543,8 @@ function renderBugItem(item, $item, col) .attr('href', $.createLink('bug', 'view', 'bugID=' + item.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '80%'); $title.appendTo($item); } - $title.attr('title', item.title).find('.text').text(item.title); + var title = rdSearchValue != '' ? "" + item.title.replaceAll(rdSearchValue, "" + rdSearchValue + "") + "": "" + item.title + ""; + $title.attr('title', item.title).find('.text').replaceWith(title); } if(scaleSize <= 2) @@ -608,7 +610,8 @@ function renderTaskItem(item, $item, col) .attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '80%'); $title.appendTo($item); } - $title.attr('title', item.name).find('.text').text(item.name); + var name = rdSearchValue != '' ? "" + item.name.replaceAll(rdSearchValue, "" + rdSearchValue + "") + "": "" + item.name + ""; + $title.attr('title', item.name).find('.text').replaceWith(name); } if(scaleSize <= 2) @@ -804,6 +807,18 @@ function updateRegion(regionID, regionData = []) if(!regionData) regionData = regions[regionID]; var data = groupBy == 'default' ? regionData.groups : regionData; + if(data == null || data.length == 0) + { + if(groupBy == 'default') $("div[data-id^=" + regionID + "].region").hide(); + if(groupBy != 'default') $("div[data-id^=" + regionID + "].kanban").hide(); + return false; + } + else + { + if(groupBy == 'default') $("div[data-id^=" + regionID + "].region").show(); + if(groupBy != 'default') $("div[data-id^=" + regionID + "].kanban").show(); + } + $region.empty(); $region.data('zui.kanban').render(data); resetRegionHeight('open'); return true; @@ -1516,7 +1531,7 @@ $(function() var lastUpdateData; setInterval(function() { - $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD'), function(data) + $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue' + rdSearchValue), function(data) { if(data && lastUpdateData !== data) { @@ -1592,3 +1607,58 @@ function resetRegionHeight(fold) $('.region').css('height', regionHeaderHeight); } } + +/** + * Toggle RDSearchBox. + * + * @access public + * @return void + */ +function toggleRDSearchBox() +{ + rdSearchValue = ''; + $('#rdSearchBox').toggle(); + if($('#rdSearchBox').css('display') == 'block') + { + $(".querybox-toggle").css("color", "#0c64eb"); + } + else + { + $(".querybox-toggle").css("color", ""); + $('#rdKanbanSearchInput').attr('value', ''); + searchCards(''); + } +} + +/** + * Search all cards. + * + * @param string $value + * @access public + * @return void + */ +function searchCards(value) +{ + rdSearchValue = value; + $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + value), function(data) + { + var kanbanData = $.parseJSON(data); + var hideAll = true; + $('#kanban').children('.region').children("div[id^='kanban']").each(function() + { + var regionID = $(this).attr('data-id'); + if(kanbanData != null) data = groupBy == 'default' ? kanbanData[regionID] : kanbanData[groupBy]; + + hideAll = hideAll && !updateRegion(regionID, data); + }); + + if(hideAll && rdSearchValue != '') + { + if($('.table-empty-tip').length == 0) $('#kanban').append('

' + kanbanLang.empty + '

'); + } + else + { + $('.table-empty-tip').remove(); + } + }); +} diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 2d99e9baee..0d8f66017e 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -3,7 +3,7 @@ * The project module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: en.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 320931e280..d9c7e13fdf 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -3,7 +3,7 @@ * The execution module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: en.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ @@ -398,6 +398,7 @@ $lang->execution->confirmStoryToTask = $lang->SRCommon . '%s are conver $lang->execution->ge = "『%s』should be >= actual begin『%s』."; $lang->execution->storyDragError = "The {$lang->SRCommon} is still a draft or has been changed, please drag it after the review"; $lang->execution->countTip = ' (%s member)'; +$lang->execution->pleaseInput = "Enter"; /* Statistics. */ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 4c980ef16e..04bbb59e42 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -3,7 +3,7 @@ * The project module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: en.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index b9244ac46b..8f25c9c16f 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -3,7 +3,7 @@ * The execution module zh-cn file of ZenTaoMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: zh-cn.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ @@ -398,6 +398,7 @@ $lang->execution->confirmStoryToTask = '%s' . $lang->SRCommon . '已经 $lang->execution->ge = "『%s』应当不小于实际开始时间『%s』。"; $lang->execution->storyDragError = "该{$lang->SRCommon}还是草稿或已变更状态，请评审通过后再拖动"; $lang->execution->countTip = '（%s人）'; +$lang->execution->pleaseInput = "请输入"; /* 统计。*/ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index 39047bd819..17bf814a6f 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -3,7 +3,7 @@ * The execution module zh-tw file of ZenTaoMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: zh-tw.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/execution/model.php b/module/execution/model.php index c09d465202..bb760866c5 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -3,7 +3,7 @@ * The model file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: model.php 5118 2013-07-12 07:41:41Z chencongzhi520@gmail.com $ @@ -818,9 +818,11 @@ class executionModel extends model ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) + ->stripTags($this->config->execution->editor->start['id'], $this->config->allowedTags) ->remove('comment') ->get(); + $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->start['id'], $this->post->uid); $this->dao->update(TABLE_EXECUTION)->data($execution) ->autoCheck() ->check($this->config->execution->start->requiredFields, 'notempty') @@ -849,6 +851,7 @@ class executionModel extends model $execution = fixer::input('post') ->add('id', $executionID) + ->stripTags($this->config->execution->editor->putoff['id'], $this->config->allowedTags) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->remove('comment') @@ -857,6 +860,7 @@ class executionModel extends model if($this->config->systemMode == 'new') $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end); if(dao::isError()) return false; + $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->putoff['id'], $this->post->uid); $this->dao->update(TABLE_EXECUTION)->data($execution) ->autoCheck() ->checkFlow() @@ -884,8 +888,10 @@ class executionModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->setDefault('suspendedDate', helper::today()) + ->stripTags($this->config->execution->editor->suspend['id'], $this->config->allowedTags) ->remove('comment')->get(); + $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->suspend['id'], $this->post->uid); $this->dao->update(TABLE_EXECUTION)->data($execution) ->autoCheck() ->checkFlow() @@ -913,6 +919,7 @@ class executionModel extends model ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) + ->stripTags($this->config->execution->editor->activate['id'], $this->config->allowedTags) ->remove('comment,readjustTime,readjustTask') ->get(); @@ -922,6 +929,7 @@ class executionModel extends model unset($execution->end); } + $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->activate['id'], $this->post->uid); $this->dao->update(TABLE_EXECUTION)->data($execution) ->autoCheck() ->checkFlow() @@ -995,11 +1003,13 @@ class executionModel extends model ->setDefault('closedDate', $now) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) + ->stripTags($this->config->execution->editor->close['id'], $this->config->allowedTags) ->remove('comment') ->get(); $this->lang->error->ge = $this->lang->execution->ge; + $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->close['id'], $this->post->uid); $this->dao->update(TABLE_EXECUTION)->data($execution) ->autoCheck() ->check($this->config->execution->close->requiredFields,'notempty') diff --git a/module/execution/view/activate.html.php b/module/execution/view/activate.html.php index 7cb5cd726b..c038087564 100644 --- a/module/execution/view/activate.html.php +++ b/module/execution/view/activate.html.php @@ -3,7 +3,7 @@ * The suspend file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/execution/view/ajaxkanbansetting.html.php b/module/execution/view/ajaxkanbansetting.html.php index 973ddb0ece..61f28e2d5c 100644 --- a/module/execution/view/ajaxkanbansetting.html.php +++ b/module/execution/view/ajaxkanbansetting.html.php @@ -3,7 +3,7 @@ * The kanban setting view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package execution * @version $Id$ diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index bfaa86024e..8625ccaa59 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -3,7 +3,7 @@ * The html template file of all method of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package execution * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index 2dbc771ad0..28171c1ef2 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php index a3831983d7..16240a1292 100644 --- a/module/execution/view/bug.html.php +++ b/module/execution/view/bug.html.php @@ -3,7 +3,7 @@ * The bug view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: bug.html.php 4894 2013-06-25 01:28:39Z wyd621@gmail.com $ diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php index b74accd8c1..b8287370df 100644 --- a/module/execution/view/build.html.php +++ b/module/execution/view/build.html.php @@ -3,7 +3,7 @@ * The build view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: build.html.php 4262 2013-01-24 08:48:56Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php index e059b7ce32..a1d2908d99 100644 --- a/module/execution/view/burn.html.php +++ b/module/execution/view/burn.html.php @@ -3,7 +3,7 @@ * The burn view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: burn.html.php 4164 2013-01-20 08:27:55Z wwccss $ diff --git a/module/execution/view/close.html.php b/module/execution/view/close.html.php index 11ebcd1ed4..189005dac5 100644 --- a/module/execution/view/close.html.php +++ b/module/execution/view/close.html.php @@ -3,7 +3,7 @@ * The suspend file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/execution/view/computeburn.html.php b/module/execution/view/computeburn.html.php index ea9ea7d339..3154e7649f 100644 --- a/module/execution/view/computeburn.html.php +++ b/module/execution/view/computeburn.html.php @@ -3,7 +3,7 @@ * The computeburn view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fu Jia * @package execution * @version $Id: computeburn.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 1be01f0fd3..ad142d687e 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -3,7 +3,7 @@ * The create view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/doc.html.php b/module/execution/view/doc.html.php index b33414af04..9d0fed3dd5 100644 --- a/module/execution/view/doc.html.php +++ b/module/execution/view/doc.html.php @@ -3,7 +3,7 @@ * The doc view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id$ diff --git a/module/execution/view/dynamic.html.php b/module/execution/view/dynamic.html.php index b7f7185db3..2ec2c6d673 100755 --- a/module/execution/view/dynamic.html.php +++ b/module/execution/view/dynamic.html.php @@ -3,7 +3,7 @@ * The action->dynamic view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $ diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 0e7c0ffa9c..b8d706294c 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/export.html.php b/module/execution/view/export.html.php index 00ddbfa15f..e03c617317 100644 --- a/module/execution/view/export.html.php +++ b/module/execution/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id$ diff --git a/module/execution/view/fixfirst.html.php b/module/execution/view/fixfirst.html.php index 922daff6e4..9781c5539f 100644 --- a/module/execution/view/fixfirst.html.php +++ b/module/execution/view/fixfirst.html.php @@ -3,7 +3,7 @@ * The fixFirst view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package execution * @version $Id$ diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php index 2c8696c569..9eeef59025 100644 --- a/module/execution/view/grouptask.html.php +++ b/module/execution/view/grouptask.html.php @@ -3,7 +3,7 @@ * The task group view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: grouptask.html.php 4143 2013-01-18 07:01:06Z wyd621@gmail.com $ diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php index 250c0fa67d..698f9985ff 100755 --- a/module/execution/view/importbug.html.php +++ b/module/execution/view/importbug.html.php @@ -3,7 +3,7 @@ * The import view file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package task * @version $Id$ diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php index e03a6f48d7..6224baf7bb 100644 --- a/module/execution/view/importtask.html.php +++ b/module/execution/view/importtask.html.php @@ -3,7 +3,7 @@ * The importtask view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: importtask.html.php 4669 2013-04-23 02:28:08Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/index.html.php b/module/execution/view/index.html.php index 08567d241d..91f8f2fbb5 100644 --- a/module/execution/view/index.html.php +++ b/module/execution/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index 989f89af83..653ad0e4b4 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -3,7 +3,7 @@ * The kanban file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package execution * @version $Id: kanban.html.php 935 2022-01-11 16:49:24Z $ @@ -53,6 +53,7 @@ js::set('productCount', count($productNames)); js::set('executionID', $execution->id); js::set('reviewStoryParis', $reviewStoryParis); js::set('needLinkProducts', $lang->execution->needLinkProducts); +js::set('rdSearchValue', ''); $canSortRegion = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1; $canEditRegion = commonModel::hasPriv('kanban', 'editRegion'); @@ -134,7 +135,13 @@ js::set('priv',
+
+ +
" . $lang->searchAB, '', "class='btn btn-link querybox-toggle'"); echo html::a('javascript:fullScreen()', " " . $lang->kanban->fullScreen, '', "class='btn btn-link'"); $actions = ''; $printCreateRegion = (common::hasPriv('kanban', 'createRegion') and $groupBy == 'default'); diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php index cc3a436cda..a95462dfd7 100644 --- a/module/execution/view/linkstory.html.php +++ b/module/execution/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: linkstory.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/execution/view/managemembers.html.php b/module/execution/view/managemembers.html.php index a733ea97ca..a98bedd4d3 100644 --- a/module/execution/view/managemembers.html.php +++ b/module/execution/view/managemembers.html.php @@ -3,7 +3,7 @@ * The link user view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: managemembers.html.php 4662 2013-04-18 02:34:33Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/manageproducts.html.php b/module/execution/view/manageproducts.html.php index fb462be2a4..dbe1f2f567 100644 --- a/module/execution/view/manageproducts.html.php +++ b/module/execution/view/manageproducts.html.php @@ -3,7 +3,7 @@ * The manage product view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: manageproducts.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/execution/view/putoff.html.php b/module/execution/view/putoff.html.php index a6a21cb80e..2918d31257 100644 --- a/module/execution/view/putoff.html.php +++ b/module/execution/view/putoff.html.php @@ -3,7 +3,7 @@ * The delay file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: delay.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/execution/view/start.html.php b/module/execution/view/start.html.php index 8a67e8954b..d66e74a982 100644 --- a/module/execution/view/start.html.php +++ b/module/execution/view/start.html.php @@ -3,7 +3,7 @@ * The start file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: start.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 8f92741b8c..65059f64be 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -3,7 +3,7 @@ * The story view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: story.html.php 5117 2013-07-12 07:03:14Z chencongzhi520@gmail.com $ diff --git a/module/execution/view/storyestimate.html.php b/module/execution/view/storyestimate.html.php index 1ca8f19b73..30e5fa3610 100644 --- a/module/execution/view/storyestimate.html.php +++ b/module/execution/view/storyestimate.html.php @@ -3,7 +3,7 @@ * The create storyestimate view of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Liyuchun * @package execution * @version $Id diff --git a/module/execution/view/suspend.html.php b/module/execution/view/suspend.html.php index b061a5e683..b9b4fcef09 100644 --- a/module/execution/view/suspend.html.php +++ b/module/execution/view/suspend.html.php @@ -3,7 +3,7 @@ * The suspend file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php index 560523475e..f254069896 100644 --- a/module/execution/view/task.html.php +++ b/module/execution/view/task.html.php @@ -3,7 +3,7 @@ * The task view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: task.html.php 4894 2013-06-25 01:28:39Z wyd621@gmail.com $ @@ -103,6 +103,7 @@ body {margin-bottom: 25px;} ?> product->searchStory;?>
+ createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));?>
execution = $executionID; - $taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")); ?>
diff --git a/module/execution/view/team.html.php b/module/execution/view/team.html.php index fa07c65c84..ef263f7bdb 100644 --- a/module/execution/view/team.html.php +++ b/module/execution/view/team.html.php @@ -3,7 +3,7 @@ * The team view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: team.html.php 4143 2013-01-18 07:01:06Z wyd621@gmail.com $ diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php index 8b42199e3d..4839f42dd1 100644 --- a/module/execution/view/testtask.html.php +++ b/module/execution/view/testtask.html.php @@ -3,7 +3,7 @@ * The browse view file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: browse.html.php 1914 2011-06-24 10:11:25Z yidong@cnezsoft.com $ diff --git a/module/execution/view/tree.html.php b/module/execution/view/tree.html.php index 95226cf5c1..0b5b785d42 100644 --- a/module/execution/view/tree.html.php +++ b/module/execution/view/tree.html.php @@ -3,7 +3,7 @@ * The execution tree view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package execution * @version $Id: tree.html.php 4894 2013-06-25 01:28:39Z wyd621@gmail.com $ diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 87e758c145..70661107d5 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -3,7 +3,7 @@ * The view method view file of execution module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package execution * @version $Id: view.html.php 4594 2013-03-13 06:16:02Z wyd621@gmail.com $ diff --git a/module/extension/control.php b/module/extension/control.php index 8057c874f8..07ca32b9c7 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -3,7 +3,7 @@ * The control file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/lang/de.php b/module/extension/lang/de.php index d19f603477..30e77a3971 100644 --- a/module/extension/lang/de.php +++ b/module/extension/lang/de.php @@ -3,7 +3,7 @@ * The extension module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index b8e7b030c4..4d273184cf 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -3,7 +3,7 @@ * The extension module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/lang/fr.php b/module/extension/lang/fr.php index b383567c32..4b2ef3778a 100644 --- a/module/extension/lang/fr.php +++ b/module/extension/lang/fr.php @@ -3,7 +3,7 @@ * The extension module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index 09fd3255db..cfdc6b926c 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -3,7 +3,7 @@ * The extension module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php index cd15001edf..8992c52b3c 100644 --- a/module/extension/lang/zh-tw.php +++ b/module/extension/lang/zh-tw.php @@ -3,7 +3,7 @@ * The extension module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/model.php b/module/extension/model.php index 2a17a5e7ae..d192337514 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -3,7 +3,7 @@ * The model file of extension module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/activate.html.php b/module/extension/view/activate.html.php index b2e5962654..e7da6800db 100644 --- a/module/extension/view/activate.html.php +++ b/module/extension/view/activate.html.php @@ -3,7 +3,7 @@ * The deactivate view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/browse.html.php b/module/extension/view/browse.html.php index 7e052847de..6c6b055fab 100644 --- a/module/extension/view/browse.html.php +++ b/module/extension/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/checkscore.html.php b/module/extension/view/checkscore.html.php index 8dd0446e6c..6a2e47eb54 100644 --- a/module/extension/view/checkscore.html.php +++ b/module/extension/view/checkscore.html.php @@ -3,7 +3,7 @@ * The install view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/deactivate.html.php b/module/extension/view/deactivate.html.php index 2932bc045e..4c816a4735 100644 --- a/module/extension/view/deactivate.html.php +++ b/module/extension/view/deactivate.html.php @@ -3,7 +3,7 @@ * The deactivate view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/erase.html.php b/module/extension/view/erase.html.php index 0512b98a01..5b2c9c73ec 100644 --- a/module/extension/view/erase.html.php +++ b/module/extension/view/erase.html.php @@ -3,7 +3,7 @@ * The erase view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/install.html.php b/module/extension/view/install.html.php index cfb7e75280..e1753ab787 100644 --- a/module/extension/view/install.html.php +++ b/module/extension/view/install.html.php @@ -3,7 +3,7 @@ * The install view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php index 740b08e67e..075b57a175 100644 --- a/module/extension/view/obtain.html.php +++ b/module/extension/view/obtain.html.php @@ -3,7 +3,7 @@ * The obtain view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/safe.html.php b/module/extension/view/safe.html.php index 2bdde08739..bef8809337 100644 --- a/module/extension/view/safe.html.php +++ b/module/extension/view/safe.html.php @@ -3,7 +3,7 @@ * The browse view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/structure.html.php b/module/extension/view/structure.html.php index f48e56e7b0..32ed442fcc 100644 --- a/module/extension/view/structure.html.php +++ b/module/extension/view/structure.html.php @@ -3,7 +3,7 @@ * The structure view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package extension * @version $Id$ diff --git a/module/extension/view/uninstall.html.php b/module/extension/view/uninstall.html.php index 200a6c990d..590b0643ae 100644 --- a/module/extension/view/uninstall.html.php +++ b/module/extension/view/uninstall.html.php @@ -3,7 +3,7 @@ * The uninstall view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/upload.html.php b/module/extension/view/upload.html.php index 359a0305f7..1307b14e2a 100644 --- a/module/extension/view/upload.html.php +++ b/module/extension/view/upload.html.php @@ -3,7 +3,7 @@ * The upload view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/extension/view/waring.htm.php b/module/extension/view/waring.htm.php index a112eac3bd..fafce51ec8 100644 --- a/module/extension/view/waring.htm.php +++ b/module/extension/view/waring.htm.php @@ -3,7 +3,7 @@ * The install view file of extension module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package extension * @version $Id$ diff --git a/module/file/control.php b/module/file/control.php index ab839b6c81..442cf467f8 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -3,7 +3,7 @@ * The control file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: control.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/file/lang/de.php b/module/file/lang/de.php index 7d9f60e419..dd63263190 100644 --- a/module/file/lang/de.php +++ b/module/file/lang/de.php @@ -3,7 +3,7 @@ * The file module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/file/lang/en.php b/module/file/lang/en.php index d48da55706..a4f66e307c 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -3,7 +3,7 @@ * The file module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/file/lang/fr.php b/module/file/lang/fr.php index fe42f40460..b1e5b6e8b3 100644 --- a/module/file/lang/fr.php +++ b/module/file/lang/fr.php @@ -3,7 +3,7 @@ * The file module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php index 31112ac912..f40ee47be0 100644 --- a/module/file/lang/zh-cn.php +++ b/module/file/lang/zh-cn.php @@ -3,7 +3,7 @@ * The file module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: zh-cn.php 4630 2013-04-10 05:54:08Z chencongzhi520@gmail.com $ diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php index 52768a7be0..2cac6c63f9 100644 --- a/module/file/lang/zh-tw.php +++ b/module/file/lang/zh-tw.php @@ -3,7 +3,7 @@ * The file module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: zh-tw.php 4630 2013-04-10 05:54:08Z chencongzhi520@gmail.com $ diff --git a/module/file/model.php b/module/file/model.php index 4ab9025187..378bfbf5a5 100644 --- a/module/file/model.php +++ b/module/file/model.php @@ -3,7 +3,7 @@ * The model file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package file * @version $Id: model.php 4976 2013-07-02 08:15:31Z wyd621@gmail.com $ diff --git a/module/file/view/edit.html.php b/module/file/view/edit.html.php index 5154440288..1329925822 100644 --- a/module/file/view/edit.html.php +++ b/module/file/view/edit.html.php @@ -3,7 +3,7 @@ * The export view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package file * @version $Id$ diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index fcf3cc95ac..6e338cdc44 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/file/view/export2csv.html.php b/module/file/view/export2csv.html.php index 275b7aa63d..a7b94ac557 100644 --- a/module/file/view/export2csv.html.php +++ b/module/file/view/export2csv.html.php @@ -3,7 +3,7 @@ * The export2csv view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/file/view/export2html.html.php b/module/file/view/export2html.html.php index 5a444ca870..c182b5827e 100644 --- a/module/file/view/export2html.html.php +++ b/module/file/view/export2html.html.php @@ -3,7 +3,7 @@ * The export2html view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/file/view/export2xml.html.php b/module/file/view/export2xml.html.php index 66a50b9632..a7b90bfaa2 100644 --- a/module/file/view/export2xml.html.php +++ b/module/file/view/export2xml.html.php @@ -3,7 +3,7 @@ * The export2xml view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/file/view/uploadimages.html.php b/module/file/view/uploadimages.html.php index 38a56a8572..58cbe13f60 100644 --- a/module/file/view/uploadimages.html.php +++ b/module/file/view/uploadimages.html.php @@ -3,7 +3,7 @@ * The uploadImages view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package file * @version $Id$ diff --git a/module/git/control.php b/module/git/control.php index efb83ec105..3858b35fcb 100644 --- a/module/git/control.php +++ b/module/git/control.php @@ -3,7 +3,7 @@ * The control file of git currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/lang/de.php b/module/git/lang/de.php index 5d40eda782..291b2b9f0c 100644 --- a/module/git/lang/de.php +++ b/module/git/lang/de.php @@ -3,7 +3,7 @@ * The git module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/lang/en.php b/module/git/lang/en.php index 26455d9468..51c35a526d 100644 --- a/module/git/lang/en.php +++ b/module/git/lang/en.php @@ -3,7 +3,7 @@ * The git module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/lang/fr.php b/module/git/lang/fr.php index 80878d1075..01d39b9966 100644 --- a/module/git/lang/fr.php +++ b/module/git/lang/fr.php @@ -3,7 +3,7 @@ * The git module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/lang/zh-cn.php b/module/git/lang/zh-cn.php index e5181335cc..1e0de37f9e 100644 --- a/module/git/lang/zh-cn.php +++ b/module/git/lang/zh-cn.php @@ -3,7 +3,7 @@ * The git module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/lang/zh-tw.php b/module/git/lang/zh-tw.php index 9e52166dcc..3d6b813ace 100644 --- a/module/git/lang/zh-tw.php +++ b/module/git/lang/zh-tw.php @@ -3,7 +3,7 @@ * The git module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/model.php b/module/git/model.php index b5247a16f9..1632d45f6a 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -3,7 +3,7 @@ * The model file of git module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package git * @version $Id$ diff --git a/module/git/view/cat.html.php b/module/git/view/cat.html.php index 79658033b7..52c3d2a35b 100644 --- a/module/git/view/cat.html.php +++ b/module/git/view/cat.html.php @@ -3,7 +3,7 @@ * The cat view file of git module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/git/view/diff.html.php b/module/git/view/diff.html.php index bae715eb15..65b3a9fc4f 100644 --- a/module/git/view/diff.html.php +++ b/module/git/view/diff.html.php @@ -3,7 +3,7 @@ * The diff view file of git module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/gitlab/control.php b/module/gitlab/control.php index e3faaf7ada..1ed38204b1 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -3,7 +3,7 @@ * The control file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package product * @version $Id: ${FILE_NAME} 5144 2020/1/8 8:10 下午 chenqi@cnezsoft.com $ diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 5701df2163..5d6d51db07 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -3,7 +3,7 @@ * The model file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package product * @version $Id: $ diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php index 2508ffa7c7..8827890737 100644 --- a/module/gitlab/view/binduser.html.php +++ b/module/gitlab/view/binduser.html.php @@ -3,7 +3,7 @@ * The batch create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 72e987e4ad..81b197a04c 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browsebranch.html.php b/module/gitlab/view/browsebranch.html.php index dd6448fb4f..bd29860a2b 100644 --- a/module/gitlab/view/browsebranch.html.php +++ b/module/gitlab/view/browsebranch.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browsebranchpriv.html.php b/module/gitlab/view/browsebranchpriv.html.php index ff40ef0c0f..181c913742 100644 --- a/module/gitlab/view/browsebranchpriv.html.php +++ b/module/gitlab/view/browsebranchpriv.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab protext branch of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yanyi Cao * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browsegroup.html.php b/module/gitlab/view/browsegroup.html.php index f111588d33..c16fb9ad8b 100644 --- a/module/gitlab/view/browsegroup.html.php +++ b/module/gitlab/view/browsegroup.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browseproject.html.php b/module/gitlab/view/browseproject.html.php index 686511c634..0acb2fa888 100644 --- a/module/gitlab/view/browseproject.html.php +++ b/module/gitlab/view/browseproject.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browsetag.html.php b/module/gitlab/view/browsetag.html.php index 517aea6750..02cc38074c 100644 --- a/module/gitlab/view/browsetag.html.php +++ b/module/gitlab/view/browsetag.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browsetagpriv.html.php b/module/gitlab/view/browsetagpriv.html.php index c3862ddccd..792e05531e 100644 --- a/module/gitlab/view/browsetagpriv.html.php +++ b/module/gitlab/view/browsetagpriv.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/browseuser.html.php b/module/gitlab/view/browseuser.html.php index 22d00db2cb..e839d2f8b7 100644 --- a/module/gitlab/view/browseuser.html.php +++ b/module/gitlab/view/browseuser.html.php @@ -3,7 +3,7 @@ * The browse view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/create.html.php b/module/gitlab/view/create.html.php index 5ca19ad88e..224aaaded3 100644 --- a/module/gitlab/view/create.html.php +++ b/module/gitlab/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/createbranch.html.php b/module/gitlab/view/createbranch.html.php index 93ca54547c..72ed873252 100644 --- a/module/gitlab/view/createbranch.html.php +++ b/module/gitlab/view/createbranch.html.php @@ -3,7 +3,7 @@ * The create branch view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/createbranchpriv.html.php b/module/gitlab/view/createbranchpriv.html.php index db316291ba..52c3e691f2 100644 --- a/module/gitlab/view/createbranchpriv.html.php +++ b/module/gitlab/view/createbranchpriv.html.php @@ -3,7 +3,7 @@ * The create view file of protext branch of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yanyi Cao * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/creategroup.html.php b/module/gitlab/view/creategroup.html.php index eb040c8556..e8f913c8fa 100644 --- a/module/gitlab/view/creategroup.html.php +++ b/module/gitlab/view/creategroup.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/createproject.html.php b/module/gitlab/view/createproject.html.php index 59c3fb620a..99450d6e31 100644 --- a/module/gitlab/view/createproject.html.php +++ b/module/gitlab/view/createproject.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/createtag.html.php b/module/gitlab/view/createtag.html.php index a578bd52cb..91eb478891 100644 --- a/module/gitlab/view/createtag.html.php +++ b/module/gitlab/view/createtag.html.php @@ -3,7 +3,7 @@ * The create view file of protext tag of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yanyi Cao * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/createtagpriv.html.php b/module/gitlab/view/createtagpriv.html.php index 68cb9e1821..cf45b66372 100644 --- a/module/gitlab/view/createtagpriv.html.php +++ b/module/gitlab/view/createtagpriv.html.php @@ -3,7 +3,7 @@ * The create view file of protect tag of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/createuser.html.php b/module/gitlab/view/createuser.html.php index 452e83f495..0be85a7bae 100644 --- a/module/gitlab/view/createuser.html.php +++ b/module/gitlab/view/createuser.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/edit.html.php b/module/gitlab/view/edit.html.php index c22bdd0a96..689ce8243a 100644 --- a/module/gitlab/view/edit.html.php +++ b/module/gitlab/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/editgroup.html.php b/module/gitlab/view/editgroup.html.php index 589f5ba5c4..10a602bb2e 100644 --- a/module/gitlab/view/editgroup.html.php +++ b/module/gitlab/view/editgroup.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/editproject.html.php b/module/gitlab/view/editproject.html.php index af366d1ccd..24e97a639c 100644 --- a/module/gitlab/view/editproject.html.php +++ b/module/gitlab/view/editproject.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/edittagpriv.html.php b/module/gitlab/view/edittagpriv.html.php index 6e710d19ad..aec4bbcbf2 100644 --- a/module/gitlab/view/edittagpriv.html.php +++ b/module/gitlab/view/edittagpriv.html.php @@ -3,7 +3,7 @@ * The edit view file of protect tag of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/edituser.html.php b/module/gitlab/view/edituser.html.php index baaa4d07cc..d5ef0b6863 100644 --- a/module/gitlab/view/edituser.html.php +++ b/module/gitlab/view/edituser.html.php @@ -3,7 +3,7 @@ * The create view file of gitlab module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package gitlab * @version $Id$ diff --git a/module/gitlab/view/importissue.html.php b/module/gitlab/view/importissue.html.php index 79f8d537f3..4480d3d5bf 100644 --- a/module/gitlab/view/importissue.html.php +++ b/module/gitlab/view/importissue.html.php @@ -3,7 +3,7 @@ * The batch create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/module/gitlab/view/view.html.php b/module/gitlab/view/view.html.php index 49cff2e5c6..45b329be03 100644 --- a/module/gitlab/view/view.html.php +++ b/module/gitlab/view/view.html.php @@ -3,7 +3,7 @@ * The view file of GitLab module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author dave.li * @package GitLab * @version $Id: view.html.php 4728 2013-05-03 06:14:34Z david18810279601@gmail.com $ diff --git a/module/group/control.php b/module/group/control.php index 8fb10dfa8e..349686526e 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -3,7 +3,7 @@ * The control file of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: control.php 4648 2013-04-15 02:45:49Z chencongzhi520@gmail.com $ diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 11310a9f58..4adb4f2e96 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -3,7 +3,7 @@ * The group module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ diff --git a/module/group/lang/en.php b/module/group/lang/en.php index f0dbde9d8e..1cded59281 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -3,7 +3,7 @@ * The group module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 714cda9ba0..48c5f742f2 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -3,7 +3,7 @@ * The group module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index dfc318bd1b..5e09201e3a 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -3,7 +3,7 @@ * The all avaliabe actions in ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id$ diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 91900afb13..e2eb80ec26 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -3,7 +3,7 @@ * The group module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: zh-cn.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index 3203e311af..68869a77c6 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -3,7 +3,7 @@ * The group module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: zh-tw.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ diff --git a/module/group/model.php b/module/group/model.php index 3c884c4086..43df868cd1 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -3,7 +3,7 @@ * The model file of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: model.php 4976 2013-07-02 08:15:31Z wyd621@gmail.com $ diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 0464eb7493..fdcb4183a9 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: browse.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php index 3712eb46e0..b739ac02af 100644 --- a/module/group/view/copy.html.php +++ b/module/group/view/copy.html.php @@ -3,7 +3,7 @@ * The copy view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: copy.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php index d99539be7a..2c80a807df 100644 --- a/module/group/view/create.html.php +++ b/module/group/view/create.html.php @@ -3,7 +3,7 @@ * The create view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: create.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php index d07ae0a257..ad2b6958bb 100644 --- a/module/group/view/edit.html.php +++ b/module/group/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: edit.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 5080605fa7..51c8d56622 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -3,7 +3,7 @@ * The manage member view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: managemember.html.php 4627 2013-04-10 05:42:20Z chencongzhi520@gmail.com $ diff --git a/module/group/view/managepriv.html.php b/module/group/view/managepriv.html.php index d89dbd8064..e6a32db7aa 100644 --- a/module/group/view/managepriv.html.php +++ b/module/group/view/managepriv.html.php @@ -3,7 +3,7 @@ * The manage privilege view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: managepriv.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/group/view/manageprojectadmin.html.php b/module/group/view/manageprojectadmin.html.php index 8c60123064..846946b60a 100644 --- a/module/group/view/manageprojectadmin.html.php +++ b/module/group/view/manageprojectadmin.html.php @@ -3,7 +3,7 @@ * The manage member view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: managemember.html.php 4627 2013-04-10 05:42:20Z chencongzhi520@gmail.com $ diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index ddaa99e4e2..46395fa68f 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -3,7 +3,7 @@ * The manage view by group view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package group * @version $Id: managepriv.html.php 1517 2011-03-07 10:02:57Z wwccss $ diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 22a6fcba6b..4de3b87550 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -3,7 +3,7 @@ * The manage privilege by group view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: managepriv.html.php 1517 2011-03-07 10:02:57Z wwccss $ diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php index 2f2dad1269..d5ce653d8e 100644 --- a/module/group/view/privbymodule.html.php +++ b/module/group/view/privbymodule.html.php @@ -3,7 +3,7 @@ * The manage privilege by group view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: managepriv.html.php 1517 2011-03-07 10:02:57Z wwccss $ diff --git a/module/holiday/control.php b/module/holiday/control.php index 385e4b6091..26658d3d81 100644 --- a/module/holiday/control.php +++ b/module/holiday/control.php @@ -3,7 +3,7 @@ * The control file of holiday module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package holiday * @version $Id diff --git a/module/holiday/model.php b/module/holiday/model.php index e1eb0503a3..ca538c2936 100644 --- a/module/holiday/model.php +++ b/module/holiday/model.php @@ -3,7 +3,7 @@ * The model file of holiday module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package holiday * @version $Id diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php index b8e880aa61..637a4ac554 100644 --- a/module/holiday/view/browse.html.php +++ b/module/holiday/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of holiday module of ZenTao. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author chujilu * @package holiday * @version $Id$ diff --git a/module/holiday/view/create.html.php b/module/holiday/view/create.html.php index f764d14933..a286293d64 100644 --- a/module/holiday/view/create.html.php +++ b/module/holiday/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of holiday module of ZenTao. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author chujilu * @package holiday * @version $Id$ diff --git a/module/holiday/view/edit.html.php b/module/holiday/view/edit.html.php index bcb7e739f6..4dd0c050b2 100644 --- a/module/holiday/view/edit.html.php +++ b/module/holiday/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of holiday module of ZenTao. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author chujilu * @package holiday * @version $Id$ diff --git a/module/index/control.php b/module/index/control.php index 93e7920ba7..65ee39cde6 100644 --- a/module/index/control.php +++ b/module/index/control.php @@ -5,7 +5,7 @@ * When requests the root of a website, this index module will be called. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: control.php 5036 2013-07-06 05:26:44Z wyd621@gmail.com $ diff --git a/module/index/model.php b/module/index/model.php index 19befcbb54..6649b41e29 100644 --- a/module/index/model.php +++ b/module/index/model.php @@ -3,7 +3,7 @@ * The model file of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package index * @version $Id: model.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php index 4465748c54..0dcd324db1 100644 --- a/module/index/view/index.html.php +++ b/module/index/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id: index.html.php 1947 2011-06-29 11:58:03Z wwccss $ diff --git a/module/install/control.php b/module/install/control.php index f8704081e3..6bff548f45 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -3,7 +3,7 @@ * The control file of install currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: control.php 4297 2013-01-27 07:51:45Z wwccss $ diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 3c5d313576..c7f9c152f1 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -3,7 +3,7 @@ * The install module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: en.php 4972 2013-07-02 06:50:10Z zhujinyonging@gmail.com $ diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 6cfad99730..e835e79e63 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -3,7 +3,7 @@ * The install module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: en.php 4972 2013-07-02 06:50:10Z zhujinyonging@gmail.com $ diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index 2ff0d5a146..83f5b86c4c 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -3,7 +3,7 @@ * The install module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: en.php 4972 2013-07-02 06:50:10Z zhujinyonging@gmail.com $ diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 12c9a71906..cf12a9900b 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -3,7 +3,7 @@ * The install module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: zh-cn.php 4972 2013-07-02 06:50:10Z zhujinyonging@gmail.com $ diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 8203e2fe47..32ad4cd077 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -3,7 +3,7 @@ * The install module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: zh-tw.php 4972 2013-07-02 06:50:10Z zhujinyonging@gmail.com $ diff --git a/module/install/model.php b/module/install/model.php index b5cc286e0f..794df3de6d 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -3,7 +3,7 @@ * The model file of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package install * @version $Id: model.php 5006 2013-07-03 08:52:21Z wyd621@gmail.com $ diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php index 83cd12720b..7cdd66518c 100644 --- a/module/install/view/index.html.php +++ b/module/install/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/install/view/license.html.php b/module/install/view/license.html.php index 28e7f61e88..682e0a670c 100644 --- a/module/install/view/license.html.php +++ b/module/install/view/license.html.php @@ -3,7 +3,7 @@ * The html file of license method of install module of ZentaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package install * @version $Id$ diff --git a/module/install/view/step1.html.php b/module/install/view/step1.html.php index 61233e3865..b968e163e3 100644 --- a/module/install/view/step1.html.php +++ b/module/install/view/step1.html.php @@ -3,7 +3,7 @@ * The html template file of step1 method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: step1.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/install/view/step2.html.php b/module/install/view/step2.html.php index f6bf917b4c..60a64fdb73 100644 --- a/module/install/view/step2.html.php +++ b/module/install/view/step2.html.php @@ -3,7 +3,7 @@ * The html template file of step2 method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: step2.html.php 4972 2013-07-02 06:50:10Z zhujinyonging@gmail.com $ diff --git a/module/install/view/step3.html.php b/module/install/view/step3.html.php index 80ff6dd2c1..1a483e945b 100644 --- a/module/install/view/step3.html.php +++ b/module/install/view/step3.html.php @@ -3,7 +3,7 @@ * The html template file of step3 method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: step3.html.php 4297 2013-01-27 07:51:45Z wwccss $ diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index fa81c945f9..fb8a6814d7 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -3,7 +3,7 @@ * The to20 view file of install module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package install * @version $Id$ diff --git a/module/install/view/step5.html.php b/module/install/view/step5.html.php index 686b740b81..91ab940ac3 100644 --- a/module/install/view/step5.html.php +++ b/module/install/view/step5.html.php @@ -3,7 +3,7 @@ * The html template file of step4 method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: step4.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/install/view/step6.html.php b/module/install/view/step6.html.php index 563e0fbf43..4c52b5df67 100644 --- a/module/install/view/step6.html.php +++ b/module/install/view/step6.html.php @@ -3,7 +3,7 @@ * The html template file of index method of install module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: step5.html.php 2568 2012-02-18 15:53:35Z zhujinyong@cnezsoft.com$ diff --git a/module/jenkins/control.php b/module/jenkins/control.php index d63e246350..129e6830ca 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -4,7 +4,7 @@ * The control file of jenkins module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package product * @version $Id: ${FILE_NAME} 5144 2020/1/8 8:10 下午 chenqi@cnezsoft.com $ diff --git a/module/jenkins/model.php b/module/jenkins/model.php index bb8a8f5dce..bd4afb6fb0 100644 --- a/module/jenkins/model.php +++ b/module/jenkins/model.php @@ -3,7 +3,7 @@ * The model file of jenkins module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package product * @version $Id: $ diff --git a/module/jenkins/view/browse.html.php b/module/jenkins/view/browse.html.php index b4fb15896c..089ff77834 100644 --- a/module/jenkins/view/browse.html.php +++ b/module/jenkins/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of jenkins module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package jenkins * @version $Id$ diff --git a/module/jenkins/view/create.html.php b/module/jenkins/view/create.html.php index 725f5bf3a5..34c988c862 100644 --- a/module/jenkins/view/create.html.php +++ b/module/jenkins/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of jenkins module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package jenkins * @version $Id$ diff --git a/module/jenkins/view/edit.html.php b/module/jenkins/view/edit.html.php index a5a6c98d94..303ff9d57f 100644 --- a/module/jenkins/view/edit.html.php +++ b/module/jenkins/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of jenkins module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package jenkins * @version $Id$ diff --git a/module/job/control.php b/module/job/control.php index eddf5b5099..967db36bd7 100644 --- a/module/job/control.php +++ b/module/job/control.php @@ -3,7 +3,7 @@ * The control file of job of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package job * @version $Id$ diff --git a/module/job/model.php b/module/job/model.php index 751924af9e..70f461b6d2 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -3,7 +3,7 @@ * The model file of job module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package job * @version $Id$ diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php index ce50ed120e..eac0cb5328 100644 --- a/module/job/view/browse.html.php +++ b/module/job/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of job module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package job * @version $Id$ diff --git a/module/job/view/create.html.php b/module/job/view/create.html.php index 9a3f95cdde..af31444465 100644 --- a/module/job/view/create.html.php +++ b/module/job/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of job module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package job * @version $Id$ diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php index ade02dfa41..8c2d7153e7 100644 --- a/module/job/view/edit.html.php +++ b/module/job/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of job module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package job * @version $Id$ diff --git a/module/job/view/view.html.php b/module/job/view/view.html.php index 95a6d3cd61..e5e60b6705 100644 --- a/module/job/view/view.html.php +++ b/module/job/view/view.html.php @@ -3,7 +3,7 @@ * The view file of job module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package job * @version $Id$ diff --git a/module/kanban/control.php b/module/kanban/control.php index 04e357b827..1b83d01bfb 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -3,7 +3,7 @@ * The control file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package kanban * @version $Id: control.php 4460 2021-10-26 11:03:02Z chencongzhi520@gmail.com $ diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css index 1c19212de7..fdda9edfc4 100644 --- a/module/kanban/css/space.css +++ b/module/kanban/css/space.css @@ -10,6 +10,8 @@ .space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 255px)} .spaceName {font-size: 16px; font-weight: bold;} .spaceTitle .icon-cube {font-size: 16px;} +.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;} +#more .setting {margin-left: -25px; min-width: 80px} .kanbans > .col {width: 25% !important;} @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}} diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 292dd960eb..b5e565dc96 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -27,6 +27,7 @@ $lang->kanban->columnWidth = 'Column Width'; $lang->kanban->setColumnWidth = 'Set Column Width'; $lang->kanban->deleteLane = 'Delete Lane'; $lang->kanban->createColumn = 'Create Column'; +$lang->kanban->emptyDesc = 'No description'; $lang->kanban->editColumn = 'Edit Column'; $lang->kanban->sortColumn = 'Sort Column'; $lang->kanban->deleteColumn = 'Delete Column'; @@ -278,14 +279,14 @@ $lang->kanbanspace->empty = 'No Space'; $lang->kanbanspace->aclList['open'] = 'Open (Accessible with kanban view permissions)'; $lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)'; -$lang->kanbanspace->featureBar['private'] = 'Private Space'; +$lang->kanbanspace->featureBar['involved'] = 'Involved'; $lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space'; $lang->kanbanspace->featureBar['public'] = 'Public Space'; -$lang->kanbanspace->featureBar['involved'] = 'Involved'; +$lang->kanbanspace->featureBar['private'] = 'Private Space'; -$lang->kanbanspace->typeList['private'] = 'Private Space'; $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space'; $lang->kanbanspace->typeList['public'] = 'Public Space'; +$lang->kanbanspace->typeList['private'] = 'Private Space'; $lang->kanbancolumn = new stdclass(); $lang->kanbancolumn->name = $lang->kanban->columnName; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 7dcb446d7b..e5956c4713 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -27,6 +27,7 @@ $lang->kanban->columnWidth = '列宽度'; $lang->kanban->setColumnWidth = '设置列宽度'; $lang->kanban->deleteLane = '删除泳道'; $lang->kanban->createColumn = '创建看板列'; +$lang->kanban->emptyDesc = '暂无描述'; $lang->kanban->editColumn = '编辑看板列'; $lang->kanban->sortColumn = '看板列排序'; $lang->kanban->deleteColumn = '删除看板列'; @@ -278,14 +279,14 @@ $lang->kanbanspace->empty = '暂时没有空间'; $lang->kanbanspace->aclList['open'] = '公开（有看板空间视图权限即可访问）'; $lang->kanbanspace->aclList['private'] = '私有（只有看板空间负责人、团队成员、白名单可访问）'; -$lang->kanbanspace->featureBar['private'] = '私人空间'; +$lang->kanbanspace->featureBar['involved'] = '我参与的'; $lang->kanbanspace->featureBar['cooperation'] = '协作空间'; $lang->kanbanspace->featureBar['public'] = '公共空间'; -$lang->kanbanspace->featureBar['involved'] = '我参与的'; +$lang->kanbanspace->featureBar['private'] = '私人空间'; -$lang->kanbanspace->typeList['private'] = '私人空间'; $lang->kanbanspace->typeList['cooperation'] = '协作空间'; $lang->kanbanspace->typeList['public'] = '公共空间'; +$lang->kanbanspace->typeList['private'] = '私人空间'; $lang->kanbancolumn = new stdclass(); $lang->kanbancolumn->name = $lang->kanban->columnName; diff --git a/module/kanban/model.php b/module/kanban/model.php index 4524366d8c..09b45f0eb1 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3,7 +3,7 @@ * The model file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: model.php 5118 2021-10-22 10:18:41Z $ @@ -808,13 +808,14 @@ class kanbanModel extends model * @param string $orderBy * @param int $regionID * @param string $groupBy + * @param string $searchValue * * @access public * @return array */ - public function getRDKanban($executionID, $browseType = 'all', $orderBy = 'id_desc', $regionID = 0, $groupBy = 'default') + public function getRDKanban($executionID, $browseType = 'all', $orderBy = 'id_desc', $regionID = 0, $groupBy = 'default', $searchValue = '') { - if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy); + if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy, $searchValue); $kanbanData = array(); $actions = array('sortGroup'); @@ -823,7 +824,7 @@ class kanbanModel extends model $groupGroup = $this->getGroupGroupByRegions($regionIDList); $laneGroup = $this->getLaneGroupByRegions($regionIDList, $browseType); $columnGroup = $this->getRDColumnGroupByRegions($regionIDList, array_keys($laneGroup)); - $cardGroup = $this->getCardGroupByExecution($executionID, $browseType, $orderBy); + $cardGroup = $this->getCardGroupByExecution($executionID, $browseType, $orderBy, $searchValue); foreach($regions as $regionID => $regionName) { @@ -838,13 +839,16 @@ class kanbanModel extends model $lanes = zget($laneGroup, $group->id, array()); if(!$lanes) continue; - foreach($lanes as $lane) + foreach($lanes as $key => $lane) { $this->refreshCards($lane); $lane->items = isset($cardGroup[$lane->id]) ? $cardGroup[$lane->id] : array(); $lane->defaultCardType = $lane->type; + if($searchValue != '' and count($lane->items) == 0) unset($lanes[$key]); } + $lanes = array_values($lanes); + if($searchValue != '' and empty($lanes)) continue; $group->columns = zget($columnGroup, $group->id, array()); $group->lanes = $lanes; $group->actions = array(); @@ -1250,10 +1254,12 @@ class kanbanModel extends model * @param int $kanbanID * @param string $browseType all|task|bug|story * @param string $orderBy + * @param string $searchValue + * * @access public * @return array */ - public function getCardGroupByExecution($executionID, $browseType = 'all', $orderBy = 'id_asc') + public function getCardGroupByExecution($executionID, $browseType = 'all', $orderBy = 'id_asc', $searchValue = '') { $cards = $this->dao->select('t1.*, t2.type as columnType') ->from(TABLE_KANBANCELL)->alias('t1') @@ -1297,12 +1303,14 @@ class kanbanModel extends model if($cell->type == 'task') { + if($searchValue != '' and strpos($object->name, $searchValue) === false) continue; $cardData['name'] = $object->name; $cardData['status'] = $object->status; $cardData['left'] = $object->left; } else { + if($searchValue != '' and strpos($object->title, $searchValue) === false) continue; $cardData['title'] = $object->title; } $cardGroup[$laneID][$cell->columnType][] = $cardData; @@ -1440,10 +1448,12 @@ class kanbanModel extends model * @param int $executionID * @param string $browseType * @param string $groupBy + * @param string $searchValue + * * @access public * @return array */ - public function getKanban4Group($executionID, $browseType, $groupBy) + public function getKanban4Group($executionID, $browseType, $groupBy, $searchValue = '') { /* Get card data. */ $cardList = array(); @@ -1551,21 +1561,24 @@ class kanbanModel extends model if($browseType == 'task') { + if($searchValue != '' and strpos($object->name, $searchValue) === false) continue; $cardData['name'] = $object->name; $cardData['status'] = $object->status; $cardData['left'] = $object->left; } else { + if($searchValue != '' and strpos($object->title, $searchValue) === false) continue; $cardData['title'] = $object->title; } $laneData['cards'][$column->columnType][] = $cardData; $cardOrder ++; } - if(!isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array(); + if(empty($searchValue) and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array(); } + if($searchValue != '' and empty($laneData['cards'])) continue; $kanbanGroup[$groupBy]['id'] = $groupBy . $laneID; $kanbanGroup[$groupBy]['columns'] = array_values($columnData); $kanbanGroup[$groupBy]['lanes'][] = $laneData; diff --git a/module/kanban/view/activate.html.php b/module/kanban/view/activate.html.php index a8d9ead62f..b92a43fe4f 100644 --- a/module/kanban/view/activate.html.php +++ b/module/kanban/view/activate.html.php @@ -3,7 +3,7 @@ * The activate file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: activate.html.php 935 2022-05-25 13:18:24Z $ diff --git a/module/kanban/view/activatecard.html.php b/module/kanban/view/activatecard.html.php index 7b61fe028d..a17fa8d564 100644 --- a/module/kanban/view/activatecard.html.php +++ b/module/kanban/view/activatecard.html.php @@ -3,7 +3,7 @@ * The activate card file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: close.html.php 935 2021-12-09 10:49:24Z $ diff --git a/module/kanban/view/activatespace.html.php b/module/kanban/view/activatespace.html.php index ee96b52254..c8bdf3ec45 100644 --- a/module/kanban/view/activatespace.html.php +++ b/module/kanban/view/activatespace.html.php @@ -3,7 +3,7 @@ * The closespace file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: activatespace.html.php 935 2021-12-15 11:22:24Z $ diff --git a/module/kanban/view/batchcreatecard.html.php b/module/kanban/view/batchcreatecard.html.php index 1fcc0cf70e..7d46b4977e 100644 --- a/module/kanban/view/batchcreatecard.html.php +++ b/module/kanban/view/batchcreatecard.html.php @@ -3,7 +3,7 @@ * The batch create view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Xin Zhou * @package kanban * @version $Id$ diff --git a/module/kanban/view/close.html.php b/module/kanban/view/close.html.php index 2ddc601a6f..6abe11eb52 100644 --- a/module/kanban/view/close.html.php +++ b/module/kanban/view/close.html.php @@ -3,7 +3,7 @@ * The close file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: close.html.php 935 2021-12-09 10:49:24Z $ diff --git a/module/kanban/view/closespace.html.php b/module/kanban/view/closespace.html.php index f8910f48eb..1ecf3c8382 100644 --- a/module/kanban/view/closespace.html.php +++ b/module/kanban/view/closespace.html.php @@ -3,7 +3,7 @@ * The closespace file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: closespace.html.php 935 2021-12-15 11:22:24Z $ diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index ee4a6f5aab..0c7fbcd708 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -3,7 +3,7 @@ * The create file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: create.html.php 935 2021-12-09 13:48:24Z $ diff --git a/module/kanban/view/createcard.html.php b/module/kanban/view/createcard.html.php index 2580cd8e5c..99df929f53 100644 --- a/module/kanban/view/createcard.html.php +++ b/module/kanban/view/createcard.html.php @@ -3,7 +3,7 @@ * The create card view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: createcard.html.php 5090 2021-12-13 13:49:24Z tainshujie@cnezsoft.com $ diff --git a/module/kanban/view/createcolumn.html.php b/module/kanban/view/createcolumn.html.php index 5795e594d8..4e6a9a35cc 100644 --- a/module/kanban/view/createcolumn.html.php +++ b/module/kanban/view/createcolumn.html.php @@ -3,7 +3,7 @@ * The create lane view file of kanban module of ZentaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package kanban * @version $Id$ diff --git a/module/kanban/view/createexeclane.html.php b/module/kanban/view/createexeclane.html.php index b5b161456d..e1846eda6d 100644 --- a/module/kanban/view/createexeclane.html.php +++ b/module/kanban/view/createexeclane.html.php @@ -3,7 +3,7 @@ * The createexeclane file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: createexeclane.html.php 935 2022-01-12 17:22:24Z $ diff --git a/module/kanban/view/createregion.html.php b/module/kanban/view/createregion.html.php index bd50d0fdd1..1f4e1c2916 100644 --- a/module/kanban/view/createregion.html.php +++ b/module/kanban/view/createregion.html.php @@ -3,7 +3,7 @@ * The createregion file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: createregion.html.php 935 2021-12-15 16:23:24Z $ diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 4d385cf203..924bfcf17f 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -3,7 +3,7 @@ * The createspace file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: createspace.html.php 935 2021-12-08 14:04:24Z $ @@ -20,7 +20,7 @@
action->objectType);?>
- + diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index bb636f0379..12733487a0 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -3,7 +3,7 @@ * The edit file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: edit.html.php 935 2021-12-09 16:15:24Z $ diff --git a/module/kanban/view/editcard.html.php b/module/kanban/view/editcard.html.php index 1a39158fa1..ae80ea5add 100644 --- a/module/kanban/view/editcard.html.php +++ b/module/kanban/view/editcard.html.php @@ -3,7 +3,7 @@ * The editcard of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: editcard.html.php 4903 2021-12-13 14:25:59Z $ diff --git a/module/kanban/view/editregion.html.php b/module/kanban/view/editregion.html.php index ebd5e92308..612b1350d8 100644 --- a/module/kanban/view/editregion.html.php +++ b/module/kanban/view/editregion.html.php @@ -3,7 +3,7 @@ * The editregion file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: editregion.html.php 935 2021-10-26 16:24:24Z liumengyi@easycorp.ltd $ diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php index df5eaeeca7..13ca616cda 100644 --- a/module/kanban/view/editspace.html.php +++ b/module/kanban/view/editspace.html.php @@ -3,7 +3,7 @@ * The editspace file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: editspace.html.php 935 2021-12-08 15:46:24Z $ @@ -20,7 +20,7 @@
kanbanspace->type;?>
- + diff --git a/module/kanban/view/enablearchived.html.php b/module/kanban/view/enablearchived.html.php index 4ad241bb50..0d352fbae5 100644 --- a/module/kanban/view/enablearchived.html.php +++ b/module/kanban/view/enablearchived.html.php @@ -3,7 +3,7 @@ * The enableArchived file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Runyu Zheng * @package kanban * @version $Id: enableArchived.html.php 935 2022-01-21 11:02:24Z $ diff --git a/module/kanban/view/import.html.php b/module/kanban/view/import.html.php index 74a44f1915..c97939dc0b 100644 --- a/module/kanban/view/import.html.php +++ b/module/kanban/view/import.html.php @@ -3,7 +3,7 @@ * The import file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fangzhou Hu * @package kanban * @version $Id: import.html.php 935 2022-01-19 14:15:24Z hufangzhou@easycorp.ltd $ diff --git a/module/kanban/view/importbuild.html.php b/module/kanban/view/importbuild.html.php index 867663c420..8653862db4 100644 --- a/module/kanban/view/importbuild.html.php +++ b/module/kanban/view/importbuild.html.php @@ -3,7 +3,7 @@ * The import build view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package kanban * @version $Id: importbuild.html.php 5090 2022-01-19 14:19:24Z xieqiyu@cnezsoft.com $ diff --git a/module/kanban/view/importcard.html.php b/module/kanban/view/importcard.html.php index 98c28ea56f..9e64f9090b 100644 --- a/module/kanban/view/importcard.html.php +++ b/module/kanban/view/importcard.html.php @@ -3,7 +3,7 @@ * The import card view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package kanban * @version $Id: importcard.html.php 5090 2022-01-19 14:19:24Z xieqiyu@cnezsoft.com $ diff --git a/module/kanban/view/importexecution.html.php b/module/kanban/view/importexecution.html.php index 9b18b79bee..6819252b5e 100644 --- a/module/kanban/view/importexecution.html.php +++ b/module/kanban/view/importexecution.html.php @@ -3,7 +3,7 @@ * The import execution view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package kanban * @version $Id: importexecution.html.php 5090 2022-01-19 14:19:24Z xieqiyu@cnezsoft.com $ diff --git a/module/kanban/view/importplan.html.php b/module/kanban/view/importplan.html.php index 72db45c585..17edada081 100644 --- a/module/kanban/view/importplan.html.php +++ b/module/kanban/view/importplan.html.php @@ -3,7 +3,7 @@ * The import plan view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package kanban * @version $Id: importplan.html.php 5090 2022-01-19 14:19:24Z xieqiyu@cnezsoft.com $ diff --git a/module/kanban/view/importrelease.html.php b/module/kanban/view/importrelease.html.php index 7497e95afe..58041c1170 100644 --- a/module/kanban/view/importrelease.html.php +++ b/module/kanban/view/importrelease.html.php @@ -3,7 +3,7 @@ * The import release view of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package kanban * @version $Id: importrelease.html.php 5090 2022-01-19 14:19:24Z xieqiyu@cnezsoft.com $ diff --git a/module/kanban/view/performable.html.php b/module/kanban/view/performable.html.php index 455bfd7935..75e7a595c9 100644 --- a/module/kanban/view/performable.html.php +++ b/module/kanban/view/performable.html.php @@ -3,7 +3,7 @@ * The performable file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yue Ma * @package kanban * @version $Id: performable.html.php 935 2022-01-1 14:20:24Z $ diff --git a/module/kanban/view/sendmail.html.php b/module/kanban/view/sendmail.html.php index 939287afb9..d48a121d65 100644 --- a/module/kanban/view/sendmail.html.php +++ b/module/kanban/view/sendmail.html.php @@ -3,7 +3,7 @@ * The mail file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: sendmail.html.php 867 2022-05-17 13:50:58Z $ diff --git a/module/kanban/view/setcolumn.html.php b/module/kanban/view/setcolumn.html.php index f04b0c5acd..0a250d5d69 100644 --- a/module/kanban/view/setcolumn.html.php +++ b/module/kanban/view/setcolumn.html.php @@ -3,7 +3,7 @@ * The set column file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Thanatos * @package kanban * @version $Id: setcolumn.html.php 935 2021-10-26 16:24:24Z xiawenlong@easycorp.ltd $ diff --git a/module/kanban/view/setcolumnwidth.html.php b/module/kanban/view/setcolumnwidth.html.php index fe3d8658bb..ef6e49c376 100644 --- a/module/kanban/view/setcolumnwidth.html.php +++ b/module/kanban/view/setcolumnwidth.html.php @@ -3,7 +3,7 @@ * The setlaneheight file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: setlaneheight.html.php 935 2022-01-11 10:49:24Z $ diff --git a/module/kanban/view/setlane.html.php b/module/kanban/view/setlane.html.php index fc7e06787b..67914358d2 100644 --- a/module/kanban/view/setlane.html.php +++ b/module/kanban/view/setlane.html.php @@ -3,7 +3,7 @@ * The set lane file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package kanban * @version $Id: setlane.html.php 935 2021-10-26 16:24:24Z liyuchun@easycorp.ltd $ diff --git a/module/kanban/view/setlaneheight.html.php b/module/kanban/view/setlaneheight.html.php index c76a407076..57cd889d57 100644 --- a/module/kanban/view/setlaneheight.html.php +++ b/module/kanban/view/setlaneheight.html.php @@ -3,7 +3,7 @@ * The setlaneheight file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: setlaneheight.html.php 935 2022-01-11 10:49:24Z $ diff --git a/module/kanban/view/setwip.html.php b/module/kanban/view/setwip.html.php index 4e1c6b34bd..4c5b46b085 100644 --- a/module/kanban/view/setwip.html.php +++ b/module/kanban/view/setwip.html.php @@ -3,7 +3,7 @@ * The set WIP file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package kanban * @version $Id: setwip.html.php 935 2021-10-25 10:56:24Z liyuchun@easycorp.ltd $ diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index 9e4be37cdd..b86967cac7 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -3,7 +3,7 @@ * The space file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: space.html.php 935 2021-12-07 14:31:24Z $ @@ -47,17 +47,23 @@ name;?>

+

desc) ? $lang->kanban->emptyDesc : $space->desc;?>

status == 'closed' ? 'disabled' : '';?> status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", ' ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?> - id}", ' ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?> - - id}", ' ' . $lang->activate, '', "class='iframe'", '', true);?> - - id}", ' ' . $lang->close, '', "class='iframe'", '', true);?> - - id}", ' ' . $lang->delete, 'hiddenwin', '', '', true);?> +
+ kanban->setting;?> +
    +
  • id}", ' ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?>
    • +
  • + id}", ' ' . $lang->activate, '', "class='iframe'", '', true);?> + + id}", ' ' . $lang->close, '', "class='iframe'", '', true);?> +
    • +
  • id}", ' ' . $lang->delete, 'hiddenwin', '', '', true);?>
    • +
      +
kanbans)):?> diff --git a/module/kanban/view/splitcolumn.html.php b/module/kanban/view/splitcolumn.html.php index f1e3aa2d2f..694d0d8edf 100644 --- a/module/kanban/view/splitcolumn.html.php +++ b/module/kanban/view/splitcolumn.html.php @@ -3,7 +3,7 @@ * The splitcolumn view file of kanban module of ZentaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @autdor Shujie Tian * @package kanban * @version $Id: splitcolumn.html.php 935 2021-12-16 10:24:24Z $ diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php index d77c5837dc..2f2e999627 100644 --- a/module/kanban/view/view.html.php +++ b/module/kanban/view/view.html.php @@ -3,7 +3,7 @@ * The view file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package kanban * @version $Id: view.html.php 935 2021-12-09 10:49:24Z $ diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index e0b1562718..a9466feb3f 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -3,7 +3,7 @@ * The viewarchivedcard file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: viewarchivedcard.html.php 935 2021-12-22 15:44:24Z $ diff --git a/module/kanban/view/viewarchivedcolumn.html.php b/module/kanban/view/viewarchivedcolumn.html.php index 0d44d35a62..dc0796c67b 100644 --- a/module/kanban/view/viewarchivedcolumn.html.php +++ b/module/kanban/view/viewarchivedcolumn.html.php @@ -3,7 +3,7 @@ * The viewarchivedcolumn file of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package kanban * @version $Id: viewarchivedcolumn.html.php 935 2021-12-22 10:49:24Z $ diff --git a/module/kanban/view/viewcard.html.php b/module/kanban/view/viewcard.html.php index da15bbabe8..0e53843d8d 100644 --- a/module/kanban/view/viewcard.html.php +++ b/module/kanban/view/viewcard.html.php @@ -3,7 +3,7 @@ * The viewcard of kanban module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Mengyi Liu * @package kanban * @version $Id: viewcard.html.php 4903 2021-12-13 16:25:59Z $ diff --git a/module/mail/control.php b/module/mail/control.php index ac448f684f..46a7a67537 100755 --- a/module/mail/control.php +++ b/module/mail/control.php @@ -3,7 +3,7 @@ * The control file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package mail * @version $Id$ diff --git a/module/mail/model.php b/module/mail/model.php index 8459d4fbe7..5f53254101 100644 --- a/module/mail/model.php +++ b/module/mail/model.php @@ -3,7 +3,7 @@ * The model file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mail * @version $Id: model.php 4750 2013-05-05 00:22:53Z chencongzhi520@gmail.com $ diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php index c7f3507962..c21bc04d06 100644 --- a/module/mail/view/browse.html.php +++ b/module/mail/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package mail * @version $Id$ diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php index c34a2e199a..4ad689faa8 100755 --- a/module/mail/view/detect.html.php +++ b/module/mail/view/detect.html.php @@ -3,7 +3,7 @@ * The detect view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mail * @version $Id$ diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php index d265fdd02f..263a7a3826 100755 --- a/module/mail/view/edit.html.php +++ b/module/mail/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mail * @version $Id$ diff --git a/module/mail/view/index.html.php b/module/mail/view/index.html.php index b9bbb7fb81..18decf677a 100755 --- a/module/mail/view/index.html.php +++ b/module/mail/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package mail * @version $Id$ diff --git a/module/mail/view/save.html.php b/module/mail/view/save.html.php index ba9482bfd1..1be134a876 100755 --- a/module/mail/view/save.html.php +++ b/module/mail/view/save.html.php @@ -3,7 +3,7 @@ * The save view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mail * @version $Id$ diff --git a/module/mail/view/sendcloud.html.php b/module/mail/view/sendcloud.html.php index f68274a6cf..c75b535fb2 100755 --- a/module/mail/view/sendcloud.html.php +++ b/module/mail/view/sendcloud.html.php @@ -3,7 +3,7 @@ * The sendcloud view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mail * @version $Id$ diff --git a/module/mail/view/sendclouduser.html.php b/module/mail/view/sendclouduser.html.php index 7e6c43991a..1274c56d68 100644 --- a/module/mail/view/sendclouduser.html.php +++ b/module/mail/view/sendclouduser.html.php @@ -3,7 +3,7 @@ * The sendcloud user view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package mail * @version $Id$ diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php index 7e06279357..f1407bf68d 100755 --- a/module/mail/view/test.html.php +++ b/module/mail/view/test.html.php @@ -3,7 +3,7 @@ * The test view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mail * @version $Id$ diff --git a/module/mail/view/ztcloud.html.php b/module/mail/view/ztcloud.html.php index 492b9a45ea..8ab96e8563 100644 --- a/module/mail/view/ztcloud.html.php +++ b/module/mail/view/ztcloud.html.php @@ -3,7 +3,7 @@ * The ztcloud view file of mail module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package mail * @version $Id$ diff --git a/module/message/control.php b/module/message/control.php index 39dd149033..e154581939 100644 --- a/module/message/control.php +++ b/module/message/control.php @@ -3,7 +3,7 @@ * The control file of message of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package message * @version $Id$ diff --git a/module/message/model.php b/module/message/model.php index 1eb12a21fa..2dd836966f 100644 --- a/module/message/model.php +++ b/module/message/model.php @@ -3,7 +3,7 @@ * The model file of message module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package message * @version $Id$ diff --git a/module/message/view/browser.html.php b/module/message/view/browser.html.php index 939f0170ee..357184d830 100644 --- a/module/message/view/browser.html.php +++ b/module/message/view/browser.html.php @@ -3,7 +3,7 @@ * The browser view file of message module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package message * @version $Id$ diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php index d059b229d7..eabc23b0dd 100644 --- a/module/message/view/setting.html.php +++ b/module/message/view/setting.html.php @@ -3,7 +3,7 @@ * The setting view file of message module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package message * @version $Id$ diff --git a/module/misc/control.php b/module/misc/control.php index 1c78599c81..b9998c962b 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -3,7 +3,7 @@ * The control file of misc of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: control.php 5128 2013-07-13 08:59:49Z chencongzhi520@gmail.com $ diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 901cd084bd..236650b78c 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -3,7 +3,7 @@ * The misc module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: English.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 7d329a1dc9..6cb3c076e6 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -3,7 +3,7 @@ * The misc module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: English.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 3271ed9f1d..b7c26ca62a 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -3,7 +3,7 @@ * The misc module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: English.php 824 2010-05-02 15:32:06Z wwccss $ diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index a7d3675ec5..fad1679837 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -3,7 +3,7 @@ * The misc module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: zh-cn.php 5128 2013-07-13 08:59:49Z chencongzhi520@gmail.com $ diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 349912c577..5f3caf9615 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -3,7 +3,7 @@ * The misc module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: zh-tw.php 5128 2013-07-13 08:59:49Z chencongzhi520@gmail.com $ diff --git a/module/misc/model.php b/module/misc/model.php index fc53e03fdc..68ab08a1bc 100644 --- a/module/misc/model.php +++ b/module/misc/model.php @@ -2,7 +2,7 @@ /** * The model file of misc module of ZenTaoPMS. * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package misc * @version $Id: model.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/mr/model.php b/module/mr/model.php index 67835dcdec..765987b922 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -3,7 +3,7 @@ * The model file of mr module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author dingguodong * @package mr * @version $Id$ diff --git a/module/mr/view/approval.html.php b/module/mr/view/approval.html.php index bb47c9a38f..6007362095 100644 --- a/module/mr/view/approval.html.php +++ b/module/mr/view/approval.html.php @@ -3,7 +3,7 @@ * The MR approval file of MR module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author dingguodong * @package mr * @version $Id$ diff --git a/module/mr/view/link.html.php b/module/mr/view/link.html.php index 86411732ed..fe834e0272 100644 --- a/module/mr/view/link.html.php +++ b/module/mr/view/link.html.php @@ -3,7 +3,7 @@ * The view of mr link module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author gang zeng * @package repo * @version $Id: link.html.php $ diff --git a/module/mr/view/linkbug.html.php b/module/mr/view/linkbug.html.php index e070284cb2..cfdc4d8b6b 100644 --- a/module/mr/view/linkbug.html.php +++ b/module/mr/view/linkbug.html.php @@ -3,7 +3,7 @@ * The link bug view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mr * @version $Id: linkbug.html.php$ diff --git a/module/mr/view/linkstory.html.php b/module/mr/view/linkstory.html.php index e12ac68d2f..9e6834fa73 100644 --- a/module/mr/view/linkstory.html.php +++ b/module/mr/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of mr module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author gang zeng * @package mr * @version $Id: linkstory.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/mr/view/linktask.html.php b/module/mr/view/linktask.html.php index a22da0aeec..2f7906749e 100644 --- a/module/mr/view/linktask.html.php +++ b/module/mr/view/linktask.html.php @@ -3,7 +3,7 @@ * The link task view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package mr * @version $Id: linktask.html.php$ diff --git a/module/my/control.php b/module/my/control.php index 42e999364f..428f26c3eb 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -3,7 +3,7 @@ * The control file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: control.php 5020 2013-07-05 02:03:26Z wyd621@gmail.com $ @@ -75,18 +75,19 @@ class my extends control /** * My work view. * - * @param string $mode - * @param string $type - * @param string $orderBy - * @param int $recTotal - * @param int $recPerPage - * @param int $pageID + * @param string $mode + * @param string $type + * @param string|int $param + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ - public function work($mode = 'task', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function work($mode = 'task', $type = 'assignedTo', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); + echo $this->fetch('my', $mode, "type=$type¶m=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); $this->showWorkCount($recTotal, $recPerPage, $pageID); } @@ -210,20 +211,21 @@ EOF; /** * My contribute view. * - * @param string $mode - * @param string $type - * @param string $orderBy - * @param int $recTotal - * @param int $recPerPage - * @param int $pageID + * @param string $mode + * @param string $type + * @param string|int $param + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ - public function contribute($mode = 'task', $type = 'openedBy', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function contribute($mode = 'task', $type = 'openedBy', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { if(($mode == 'issue' or $mode == 'risk') and $type == 'openedBy') $type = 'createdBy'; - echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); + echo $this->fetch('my', $mode, "type=$type¶m=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); } /** @@ -596,15 +598,16 @@ EOF; /** * My test case. * - * @param string $type assigntome|openedbyme - * @param string $orderBy - * @param int $recTotal - * @param int $recPerPage - * @param int $pageID + * @param string $type assigntome|openedbyme + * @param string|int $param + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ - public function testcase($type = 'assigntome', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function testcase($type = 'assigntome', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { $this->loadModel('testcase'); $this->loadModel('testtask'); @@ -620,20 +623,24 @@ EOF; /* Append id for secend sort. */ $sort = common::appendOrder($orderBy); + $queryID = ($type == 'bysearch') ? (int)$param : 0; $cases = array(); - if($type == 'assigntome') - { - $cases = $this->testcase->getByAssignedTo($this->app->user->account, $sort, $pager, 'skip'); - } - elseif($type == 'openedbyme') - { - $cases = $this->testcase->getByOpenedBy($this->app->user->account, $sort, $pager, 'skip'); - } + if($type == 'assigntome') $cases = $this->testcase->getByAssignedTo($this->app->user->account, $sort, $pager, 'skip'); + if($type == 'openedbyme') $cases = $this->testcase->getByOpenedBy($this->app->user->account, $sort, $pager, 'skip'); + if($type == 'bysearch' and $this->app->rawMethod == 'contribute') $cases = $this->my->getTestcasesBySearch($queryID, 'openedbyme', $orderBy, $pager); + if($type == 'bysearch' and $this->app->rawMethod == 'work') $cases = $this->my->getTestcasesBySearch($queryID, 'assigntome', $orderBy, $pager); + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', $type == 'assigntome' ? false : true); $cases = $this->testcase->appendData($cases, $type == 'assigntome' ? 'run' : 'case'); + /* Build the search form. */ + $currentMethod = $this->app->rawMethod; + $actionURL = $this->createLink('my', $currentMethod, "mode=testcase&type=bysearch¶m=myQueryID&orderBy={$orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}&pageID={$pageID}"); + $this->config->testcase->search['onMenuBar'] = 'yes'; + $this->my->buildTestcaseSearchForm($queryID, $actionURL, $currentMethod); + /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myTestCase; $this->view->position[] = $this->lang->my->myTestCase; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 344033dd8f..5aa236aa2a 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -43,6 +43,7 @@ $lang->my->testcase = 'My Case'; $lang->my->storyConcept = 'Story Concept'; $lang->my->pri = 'Priority'; $lang->my->alert = 'You can click on your profile at the top right and select "Preference" to modify your information. '; +$lang->my->assignedToMe = 'AssignedToMe'; $lang->my->indexAction = 'My Index'; $lang->my->calendarAction = 'My Calendar'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index a0a4e36334..265f0899b7 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -43,6 +43,7 @@ $lang->my->testcase = '我的用例'; $lang->my->storyConcept = $config->URAndSR ? '默认需求概念组合' : '默认需求概念'; $lang->my->pri = '优先级'; $lang->my->alert = '后续您可以点击右上方的头像，选择“个性化设置”修改信息。'; +$lang->my->assignedToMe = '指派给我'; $lang->my->indexAction = '地盘仪表盘'; $lang->my->calendarAction = '我的日程'; diff --git a/module/my/model.php b/module/my/model.php index 280f51d2c3..b36f80cd30 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -3,7 +3,7 @@ * The model file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: model.php 4129 2013-01-18 01:58:14Z wwccss $ @@ -374,4 +374,88 @@ class myModel extends model } return $objectList; } + + /** + * Build search form. + * + * @param int $queryID + * @param string $actionURL + * @param string $type + * @access public + * @return void + */ + public function buildTestCaseSearchForm($queryID, $actionURL, $type) + { + $products = $this->dao->select('id,name')->from(TABLE_PRODUCT) + ->where('deleted')->eq(0) + ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi() + ->orderBy('order_asc') + ->fetchPairs(); + + $queryName = $type == 'contribute' ? 'contributeTestcase' : 'workTestcase'; + $this->app->loadConfig('testcase'); + $this->config->testcase->search['module'] = $queryName; + $this->config->testcase->search['queryID'] = $queryID; + $this->config->testcase->search['actionURL'] = $actionURL; + $this->config->testcase->search['params']['product']['values'] = $products; + $this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries(); + + unset($this->config->testcase->search['fields']['module']); + + $this->loadModel('search')->setSearchParams($this->config->testcase->search); + } + + /** + * Get testcases by search. + * + * @param int $queryID + * @param string $type + * @param string $orderBy + * @param int $pager + * @access public + * @return array + */ + public function getTestcasesBySearch($queryID, $type, $orderBy, $pager) + { + $queryName = $type == 'openedbyme' ? 'contributeTestcaseQuery' : 'workTestcaseQuery'; + if($queryID) + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set($queryName, $query->sql); + $this->session->set($queryName . 'Form', $query->form); + } + else + { + $this->session->set($queryName, ' 1 = 1'); + } + } + else + { + if($this->session->$queryName == false) $this->session->set($queryName, ' 1 = 1'); + } + + $myTestcaseQuery = $this->session->$queryName; + $myTestcaseQuery = preg_replace('/`(\w+)`/', 't1.`$1`', $myTestcaseQuery); + + if($type == 'openedbyme') + { + $cases = $this->dao->select('*')->from(TABLE_CASE)->alias('t1') + ->where($myTestcaseQuery) + ->andWhere('t1.openedBy')->eq($this->app->user->account) + ->andWhere('t1.deleted')->eq(0) + ->orderBy($orderBy)->page($pager)->fetchAll('id'); + } + else + { + $cases = $this->dao->select('t1.*')->from(TABLE_CASE)->alias('t1') + ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case') + ->where($myTestcaseQuery) + ->andWhere('t2.assignedTo')->eq($this->app->user->account) + ->andWhere('t1.deleted')->eq(0) + ->orderBy($orderBy)->page($pager)->fetchAll('id'); + } + return $cases; + } } diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 849203b8ff..69a18b2ab8 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -3,7 +3,7 @@ * The bug view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: bug.html.php 5107 2013-07-12 01:46:12Z chencongzhi520@gmail.com $ diff --git a/module/my/view/buildcontactlists.html.php b/module/my/view/buildcontactlists.html.php index 68e2f81877..428a417131 100644 --- a/module/my/view/buildcontactlists.html.php +++ b/module/my/view/buildcontactlists.html.php @@ -3,7 +3,7 @@ * The build contact lists view file of my module of ZentaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fei Chen * @package my * @version $Id$ diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index 4fce8a8c93..c84e4df11f 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -3,7 +3,7 @@ * The change password view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package user * @version $Id: editprofile.html.php 2605 2012-02-21 07:22:58Z wwccss $ diff --git a/module/my/view/doc.html.php b/module/my/view/doc.html.php index 0123f087d0..c74f57b6c2 100644 --- a/module/my/view/doc.html.php +++ b/module/my/view/doc.html.php @@ -3,7 +3,7 @@ * The project view file of my module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package my * @version $Id diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index a615804a70..407dc57f6f 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -3,7 +3,7 @@ * The action->dynamic view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $ diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 641353b222..590aa9fbe1 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -3,7 +3,7 @@ * The edit view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: editprofile.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php index 3dd9c02937..ad1ecd3131 100644 --- a/module/my/view/execution.html.php +++ b/module/my/view/execution.html.php @@ -3,7 +3,7 @@ * The execution view file of my module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package my * @version $Id diff --git a/module/my/view/index.html.php b/module/my/view/index.html.php index ce507842fd..a1069eb376 100644 --- a/module/my/view/index.html.php +++ b/module/my/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 1947 2011-06-29 11:58:03Z wwccss $ diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php index 5c3a6fdf21..4f395908f8 100644 --- a/module/my/view/managecontacts.html.php +++ b/module/my/view/managecontacts.html.php @@ -3,7 +3,7 @@ * The contacts manage page of my module. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author chunsheng wang * @package my * @version $Id$ diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php index 8ff62c1863..5ba6ea9786 100755 --- a/module/my/view/preference.html.php +++ b/module/my/view/preference.html.php @@ -3,7 +3,7 @@ * The preference view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package user * @version $Id: editprofile.html.php 2605 2012-02-21 07:22:58Z wwccss $ diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index 33e9c60d5a..c4cce075b8 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -3,7 +3,7 @@ * The profile view file of my module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package my * @version $Id: profile.html.php 4694 2013-05-02 01:40:54Z chencongzhi520@gmail.com $ diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 0f6bbd5308..6c67c0bb8b 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -3,7 +3,7 @@ * The project view file of my module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package my * @version $Id diff --git a/module/my/view/score.html.php b/module/my/view/score.html.php index 2987dc86c4..b939218511 100644 --- a/module/my/view/score.html.php +++ b/module/my/view/score.html.php @@ -2,7 +2,7 @@ /** * The score view file of my module of ZenTaoPMS. * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Memory * @package my * @version $Id$ diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 0ff5835dd6..16e4e4076a 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -3,7 +3,7 @@ * The task view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: task.html.php 5101 2013-07-12 00:44:27Z chencongzhi520@gmail.com $ diff --git a/module/my/view/team.html.php b/module/my/view/team.html.php index c99df1ccde..b4dccb6594 100644 --- a/module/my/view/team.html.php +++ b/module/my/view/team.html.php @@ -3,7 +3,7 @@ * The browse view file of product dept of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 604a4c0236..0aae03d69e 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -3,7 +3,7 @@ * The test view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: test.html.php 1191 2010-11-13 07:30:35Z jajacn@126.com $ @@ -19,11 +19,20 @@
{$pager->recTotal}"; - if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedbyme"), "{$lang->testcase->openedByMe}" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'"); + if($app->rawMethod == 'contribute') + { + echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedbyme"), "{$lang->testcase->openedByMe}" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'"); + } + else + { + echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "{$lang->my->assignedToMe}" . ($type == 'assigntome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assigntome' ? ' btn-active-text' : '') . "'"); + } ?> + loadModel('search');echo $lang->search->common;?>
+
rawMethod == 'contribute' ? 'contributeTestcase' : 'workTestcase');?>>

testcase->noCase;?>

diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index caf1c73096..7a07dd9a4e 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -3,7 +3,7 @@ * The testtask view file of my module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id$ diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index cdad0a940f..078bbba8ea 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -3,7 +3,7 @@ * The todo view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: todo.html.php 4735 2013-05-03 08:30:02Z chencongzhi520@gmail.com $ diff --git a/module/personnel/control.php b/module/personnel/control.php index aa29526bac..2fb6a96424 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -3,7 +3,7 @@ * The control file of personnel of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package personnel * @version $Id$ diff --git a/module/personnel/model.php b/module/personnel/model.php index d4833d2afb..eff98fcaa9 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -3,7 +3,7 @@ * The model file of personnel of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package personnel * @version $Id$ diff --git a/module/personnel/view/accessible.html.php b/module/personnel/view/accessible.html.php index 4fd59b91a9..ba5ef9ae03 100644 --- a/module/personnel/view/accessible.html.php +++ b/module/personnel/view/accessible.html.php @@ -3,7 +3,7 @@ * The html template file of accessible method of personnel module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php index 715b06fede..3a6e985a23 100644 --- a/module/personnel/view/addwhitelist.html.php +++ b/module/personnel/view/addwhitelist.html.php @@ -3,7 +3,7 @@ * The create addwhitelist view of personnel module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package personnel * @version $Id diff --git a/module/personnel/view/invest.html.php b/module/personnel/view/invest.html.php index 14ce02aea2..2339adf157 100644 --- a/module/personnel/view/invest.html.php +++ b/module/personnel/view/invest.html.php @@ -3,7 +3,7 @@ * The html template file of invest method of personnel module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php index 767b8726d4..ad1d4346df 100644 --- a/module/personnel/view/whitelist.html.php +++ b/module/personnel/view/whitelist.html.php @@ -3,7 +3,7 @@ * The whitelist view of personnel module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package personnel * @version $Id diff --git a/module/pipeline/model.php b/module/pipeline/model.php index 1e42120602..59bb07e11a 100644 --- a/module/pipeline/model.php +++ b/module/pipeline/model.php @@ -3,7 +3,7 @@ * The model file of pipeline module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chenqi * @package product * @version $Id: $ diff --git a/module/product/config.php b/module/product/config.php index f7130554c9..e4259cb6be 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -34,6 +34,7 @@ $config->product->search['fields']['estimate'] = $lang->story->estimate; $config->product->search['fields']['source'] = $lang->story->source; $config->product->search['fields']['sourceNote'] = $lang->story->sourceNote; $config->product->search['fields']['fromBug'] = $lang->story->fromBug; +$config->product->search['fields']['category'] = $lang->story->category; $config->product->search['fields']['openedBy'] = $lang->story->openedBy; $config->product->search['fields']['reviewedBy'] = $lang->story->reviewedBy; @@ -68,6 +69,7 @@ $config->product->search['params']['estimate'] = array('operator' => '=', $config->product->search['params']['source'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->story->sourceList); $config->product->search['params']['sourceNote'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->product->search['params']['fromBug'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->product->search['params']['category'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->story->categoryList); $config->product->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->product->search['params']['reviewedBy'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); diff --git a/module/product/control.php b/module/product/control.php index 190c2291c2..8b4940bae5 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -3,7 +3,7 @@ * The control file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: control.php 5144 2013-07-15 06:37:03Z chencongzhi520@gmail.com $ diff --git a/module/product/lang/de.php b/module/product/lang/de.php index f1c5e89f03..d32ef58e9c 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -3,7 +3,7 @@ * The product module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 9241d7a001..a20aa334df 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -3,7 +3,7 @@ * The product module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 04ee9db4de..c34a449e90 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -3,7 +3,7 @@ * The product module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index cf134f4c43..999d1f828b 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -3,7 +3,7 @@ * The product module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index 7b79893077..1e7d868f2b 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -3,7 +3,7 @@ * The product module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: zh-tw.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ diff --git a/module/product/model.php b/module/product/model.php index dd6871899a..f20a1b7d27 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -3,7 +3,7 @@ * The model file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: model.php 5118 2013-07-12 07:41:41Z chencongzhi520@gmail.com $ @@ -872,11 +872,14 @@ class productModel extends model { $oldProduct = $this->getById($productID); $now = helper::now(); - $product= fixer::input('post') + $product = fixer::input('post') ->add('id', $productID) ->setDefault('status', 'closed') - ->remove('comment')->get(); + ->stripTags($this->config->product->editor->close['id'], $this->config->allowedTags) + ->remove('comment') + ->get(); + $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->close['id'], $this->post->uid); $this->dao->update(TABLE_PRODUCT)->data($product) ->autoCheck() ->checkFlow() diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 7b29353309..3abb912eed 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -3,7 +3,7 @@ * The html productlist file of productlist method of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package ZenTaoPMS * @version $Id diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php index 5ff2efc7e4..dfe44b85ce 100755 --- a/module/product/view/batchedit.html.php +++ b/module/product/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package ZenTaoPMS * @version $Id$ diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index a92adadb01..5b5d49809f 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 4909 2013-06-26 07:23:50Z chencongzhi520@gmail.com $ diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php index 97c8302663..5ac54d7633 100644 --- a/module/product/view/build.html.php +++ b/module/product/view/build.html.php @@ -3,7 +3,7 @@ * The build view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php index c9d7ca5a85..d3b0a0bb88 100644 --- a/module/product/view/close.html.php +++ b/module/product/view/close.html.php @@ -3,7 +3,7 @@ * The close file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: close.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index f6ee68c235..6e23fdc410 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -3,7 +3,7 @@ * The create view of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: create.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/product/view/dashboard.html.php b/module/product/view/dashboard.html.php index 7b814901ff..6073d92667 100644 --- a/module/product/view/dashboard.html.php +++ b/module/product/view/dashboard.html.php @@ -3,7 +3,7 @@ * The view view of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: view.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php index 22a202c115..2ebd40cf3b 100755 --- a/module/product/view/dynamic.html.php +++ b/module/product/view/dynamic.html.php @@ -3,7 +3,7 @@ * The action->dynamic view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $ diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index ab03001dbb..ea2fe65ee7 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: edit.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/product/view/export.html.php b/module/product/view/export.html.php index c599799e2b..84cba2c5c2 100644 --- a/module/product/view/export.html.php +++ b/module/product/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id$ diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php index 476ec8f915..7a9cce8e89 100644 --- a/module/product/view/index.html.php +++ b/module/product/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package product * @version $Id$ diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php index 6e9228e03e..bd5f388399 100644 --- a/module/product/view/kanban.html.php +++ b/module/product/view/kanban.html.php @@ -3,7 +3,7 @@ * The html product kanban file of kanban method of product module of ZenTaoPMS. * * @copyright Copyright 2021-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id diff --git a/module/product/view/manageline.html.php b/module/product/view/manageline.html.php index d2e32023d8..e5b4d859ef 100644 --- a/module/product/view/manageline.html.php +++ b/module/product/view/manageline.html.php @@ -3,7 +3,7 @@ * The html productlist file of productlist method of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package ZenTaoPMS * @version $Id diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 200bffb3c7..32cb6a14d9 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 2343 2011-11-21 05:24:56Z wwccss $ diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php index fdfb13fba3..0810908751 100644 --- a/module/product/view/roadmap.html.php +++ b/module/product/view/roadmap.html.php @@ -3,7 +3,7 @@ * The roadmap view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: roadmap.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/product/view/showerrornone.html.php b/module/product/view/showerrornone.html.php index 1e14ec5acd..cf8f2cac16 100644 --- a/module/product/view/showerrornone.html.php +++ b/module/product/view/showerrornone.html.php @@ -3,7 +3,7 @@ * The none view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package product * @version $Id$ diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 9a092582f1..2263f04f35 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -3,7 +3,7 @@ * The view view of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: view.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/productplan/config.php b/module/productplan/config.php index c9c405e5d0..9e7250f7e0 100644 --- a/module/productplan/config.php +++ b/module/productplan/config.php @@ -15,3 +15,21 @@ $config->productplan->editor->view = array('id' => 'lastComment', 'tools' => ' $config->productplan->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761'); $config->productplan->future = '2030-01-01'; + +global $app, $lang; +$app->loadLang('productplan'); +$config->productplan->search['module'] = 'productplan'; + +$config->productplan->search['fields']['id'] = $lang->productplan->id; +$config->productplan->search['fields']['title'] = $lang->productplan->title; +$config->productplan->search['fields']['branch'] = $lang->productplan->branch; +$config->productplan->search['fields']['status'] = $lang->productplan->status; +$config->productplan->search['fields']['begin'] = $lang->productplan->begin; +$config->productplan->search['fields']['end'] = $lang->productplan->end; + +$config->productplan->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->productplan->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->productplan->search['params']['branch'] = array('operator' => '=', 'control' => 'select', 'values' => ''); +$config->productplan->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $lang->productplan->statusList); +$config->productplan->search['params']['begin'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->productplan->search['params']['end'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); diff --git a/module/productplan/control.php b/module/productplan/control.php index 91e1ca7c74..4510cef8eb 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -3,7 +3,7 @@ * The control file of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: control.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ @@ -283,15 +283,16 @@ class productplan extends control * * @param int $productID * @param int $branch - * @param string $orderBy * @param string $browseType + * @param int $queryID + * @param string $orderBy * @param int $recTotal * @param int $recPerPage * @param int $pageID * @access public * @return void */ - public function browse($productID = 0, $branch = '', $browseType = 'undone', $orderBy = 'begin_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1 ) + public function browse($productID = 0, $branch = '', $browseType = 'undone', $queryID = 0, $orderBy = 'begin_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1 ) { $branchID = $branch === '' ? 'all' : $branch; if(!$branch) $branch = 0; @@ -313,6 +314,11 @@ class productplan extends control $branchStatusList = array(); foreach($branchList as $productBranch) $branchStatusList[$productBranch->id] = $productBranch->status; + /* Build the search form. */ + $queryID = $browseType == 'bySearch' ? (int)$queryID : 0; + $actionURL = $this->createLink('productplan', 'browse', "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); + $this->productplan->buildSearchForm($queryID, $actionURL, $product); + if($viewType == 'kanban') { $branches = array(); @@ -353,10 +359,11 @@ class productplan extends control $this->view->browseType = $browseType; $this->view->viewType = $viewType; $this->view->orderBy = $orderBy; - $this->view->plans = $this->productplan->getList($productID, $branch, $browseType, $pager, $sort); + $this->view->plans = $this->productplan->getList($productID, $branch, $browseType, $pager, $sort, "", $queryID); $this->view->pager = $pager; $this->view->projects = $this->product->getProjectPairsByProduct($productID, $branch); $this->view->statusList = $this->lang->productplan->featureBar['browse']; + $this->view->queryID = $queryID; $this->display(); } @@ -397,7 +404,8 @@ class productplan extends control if($this->app->getViewType() == 'xhtml') $recPerPage = 10; /* Append id for secend sort. */ - $sort = common::appendOrder($orderBy); + $orderBy = ($type == 'bug' and $orderBy == 'order_desc') ? 'id_desc' : $orderBy; + $sort = common::appendOrder($orderBy); $this->commonAction($plan->product, $plan->branch); $products = $this->product->getProductPairsByProject($this->session->project); diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php index f2cc6ab8b5..5a313e3300 100644 --- a/module/productplan/lang/de.php +++ b/module/productplan/lang/de.php @@ -3,7 +3,7 @@ * The productplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index d2ec557010..da23bd9127 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -3,7 +3,7 @@ * The productplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php index c2ce442c2a..10269e2ee7 100644 --- a/module/productplan/lang/fr.php +++ b/module/productplan/lang/fr.php @@ -3,7 +3,7 @@ * The productplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 13835ce068..766defd14e 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -3,7 +3,7 @@ * The productplan module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: zh-cn.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php index 36feac7ab2..ebd3cc620f 100644 --- a/module/productplan/lang/zh-tw.php +++ b/module/productplan/lang/zh-tw.php @@ -3,7 +3,7 @@ * The productplan module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: zh-tw.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ diff --git a/module/productplan/model.php b/module/productplan/model.php index 0f443f65fc..be0161beef 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -75,17 +75,39 @@ class productplanModel extends model * @param object $pager * @param string $orderBy * @param string $param skipparent + * @param int $queryID * @access public * @return object */ - public function getList($product = 0, $branch = 0, $browseType = 'undone', $pager = null, $orderBy = 'begin_desc', $param = '') + public function getList($product = 0, $branch = 0, $browseType = 'undone', $pager = null, $orderBy = 'begin_desc', $param = '', $queryID = 0) { + if(!empty($queryID)) + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set('productplanQuery', $query->sql); + $this->session->set('productplanForm', $query->form); + } + else + { + $this->session->set('productplanQuery', ' 1 = 1'); + } + } + else + { + if($this->session->productplanQuery == false) $this->session->set('productplanQuery', ' 1 = 1'); + } + + $productplanQuery = $this->session->productplanQuery; + $date = date('Y-m-d'); $plans = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('product')->eq($product) ->andWhere('deleted')->eq(0) ->beginIF(!empty($branch) and $branch != 'all')->andWhere('branch')->eq($branch)->fi() - ->beginIF(strpos(',all,undone,', ",$browseType,") === false)->andWhere('status')->eq($browseType)->fi() + ->beginIF(strpos(',all,undone,bySearch,', ",$browseType,") === false)->andWhere('status')->eq($browseType)->fi() ->beginIF($browseType == 'undone')->andWhere('status')->in('wait,doing')->fi() + ->beginIF($browseType == 'bySearch')->andWhere($productplanQuery)->fi() ->beginIF(strpos($param, 'skipparent') !== false)->andWhere('parent')->ne(-1)->fi() ->orderBy($orderBy) ->page($pager) @@ -1182,4 +1204,23 @@ class productplanModel extends model return $menu; } + + /** + * Build search form. + * + * @param int $queryID + * @param string $actionURL + * @param object $product + * @access public + * @return void + */ + public function buildSearchForm($queryID, $actionURL, $product) + { + $this->config->productplan->search['actionURL'] = $actionURL; + $this->config->productplan->search['queryID'] = $queryID; + + if($product->type != 'normal') $this->config->productplan->search['params']['branch']['values'] = array('' => '', '0' => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($product->id, 'noempty'); + if($product->type == 'normal') unset($this->config->productplan->search['fields']['branch']); + $this->loadModel('search')->setSearchParams($this->config->productplan->search); + } } diff --git a/module/productplan/view/batchchangestatus.html.php b/module/productplan/view/batchchangestatus.html.php index cb806191dd..3835b4bf5a 100755 --- a/module/productplan/view/batchchangestatus.html.php +++ b/module/productplan/view/batchchangestatus.html.php @@ -3,7 +3,7 @@ * The batch close view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Xin Zhou * @package productplan * @version $Id$ diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php index 28705b43d8..545a57289a 100644 --- a/module/productplan/view/batchedit.html.php +++ b/module/productplan/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batchEdit view file of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package productplan * @version $Id$ diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index c206d4b389..6f8a177c8b 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of plan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package plan * @version $Id: browse.html.php 4707 2013-05-02 06:57:41Z chencongzhi520@gmail.com $ diff --git a/module/productplan/view/browsebykanban.html.php b/module/productplan/view/browsebykanban.html.php index e5e3e8a0fb..10ff417e03 100644 --- a/module/productplan/view/browsebykanban.html.php +++ b/module/productplan/view/browsebykanban.html.php @@ -3,7 +3,7 @@ * The browsebykanban view file of plan module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package plan * @version $Id: browsebykanban.html.php 4707 2021-12-27 16:07:41Z $ diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index 316cc62398..f399b26b96 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -2,7 +2,7 @@ /** * The browsebylist view file of plan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package plan * @version $Id: browsebylist.html.php 4707 2013-05-02 06:57:41Z chencongzhi520@gmail.com $ @@ -19,6 +19,7 @@ name == $browseType ? 'btn-active-text' : '';?> inlink('browse', "productID=$productID&branch=&browseType={$menuItem->name}"), $label, '', "class='btn btn-link $active' id='{$menuItem->name}'");?> + searchAB;?>
@@ -30,6 +31,7 @@
+
@@ -44,7 +46,7 @@
id&branch=$branch")?>'>
kanbanspace->type;?>
- recTotal}&recPerPage={$pager->recPerPage}"; ?> + recTotal}&recPerPage={$pager->recPerPage}"; ?> - - - - - + show) continue; + + $width = ($field->width && $field->width != 'auto' ? $field->width . 'px' : 'auto'); + $required = strpos(",$field->rules,", ",$notEmptyRule->id,") !== false ? 'required' : ''; + echo ""; + } + } + ?>
diff --git a/module/productplan/view/close.html.php b/module/productplan/view/close.html.php index 04aae9a226..60c5a5e90d 100644 --- a/module/productplan/view/close.html.php +++ b/module/productplan/view/close.html.php @@ -3,7 +3,7 @@ * The close view file of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Xin Zhou * @package productplan * @link http://www.zentao.net diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php index d89262cc47..dc6e183c77 100644 --- a/module/productplan/view/create.html.php +++ b/module/productplan/view/create.html.php @@ -3,7 +3,7 @@ * The create view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 5ffab0ae95..1c9880f2ef 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 5468ec1fd4..769e713d67 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -3,7 +3,7 @@ * The link bug view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: linkbug.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index b2c29697fc..fb18e5ddf0 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: linkstory.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/productplan/view/start.html.php b/module/productplan/view/start.html.php index 48e63d5ea0..a218f9d584 100644 --- a/module/productplan/view/start.html.php +++ b/module/productplan/view/start.html.php @@ -3,7 +3,7 @@ * The start view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author MengYi Liu * @package productplan * @version $Id: start.html.php 4728 2021-12-28 09:57:34Z $ diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index a2afbd0b85..263196fd60 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -3,7 +3,7 @@ * The view of productplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package productplan * @version $Id: view.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php index 87f36f0e7f..e9a8dc9304 100644 --- a/module/program/view/browse.html.php +++ b/module/program/view/browse.html.php @@ -3,7 +3,7 @@ * The html template file of PGMBrowse method of program module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php index 97f4289b22..f841535baa 100644 --- a/module/program/view/create.html.php +++ b/module/program/view/create.html.php @@ -3,7 +3,7 @@ * The pgmcreate view of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: pgmcreate.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/program/view/createstakeholder.html.php b/module/program/view/createstakeholder.html.php index e4b020d943..4d38a6acef 100644 --- a/module/program/view/createstakeholder.html.php +++ b/module/program/view/createstakeholder.html.php @@ -3,7 +3,7 @@ * The create stakeholder view of program module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php index c9427131b6..9a7738253b 100644 --- a/module/program/view/edit.html.php +++ b/module/program/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of program module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package program * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/program/view/export.html.php b/module/program/view/export.html.php index b1c32b73eb..2ca78f6097 100644 --- a/module/program/view/export.html.php +++ b/module/program/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id$ diff --git a/module/program/view/index.html.php b/module/program/view/index.html.php index 842d271025..91d3a2939a 100644 --- a/module/program/view/index.html.php +++ b/module/program/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/program/view/kanban.html.php b/module/program/view/kanban.html.php index 2ade64655c..61a2cbb028 100644 --- a/module/program/view/kanban.html.php +++ b/module/program/view/kanban.html.php @@ -3,7 +3,7 @@ * The html product kanban file of kanban method of product module of ZenTaoPMS. * * @copyright Copyright 2021-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php index 6618fc12d3..24586b1a78 100644 --- a/module/program/view/product.html.php +++ b/module/program/view/product.html.php @@ -3,7 +3,7 @@ * The html product list file of product method of program module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package ZenTaoPMS * @version $Id diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php index f5f336d3d9..f1b60b08e4 100644 --- a/module/program/view/project.html.php +++ b/module/program/view/project.html.php @@ -3,7 +3,7 @@ * The pgmproject view file of program module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package program * @version $Id: pgmproject.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/program/view/stakeholder.html.php b/module/program/view/stakeholder.html.php index 86a6ebe8d4..cf17227b4a 100644 --- a/module/program/view/stakeholder.html.php +++ b/module/program/view/stakeholder.html.php @@ -3,7 +3,7 @@ * The stakeholder view of program module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/programplan/control.php b/module/programplan/control.php index 08884b9877..fc503a4e7c 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -3,7 +3,7 @@ * The control file of programplan currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: control.php 5107 2013-07-12 01:46:12Z chencongzhi520@gmail.com $ diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index 37a10b3e13..4f9ee44aa1 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -3,7 +3,7 @@ * The programplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index b9ead0dd32..ecfaad4b07 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -3,7 +3,7 @@ * The programplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index 37a10b3e13..4f9ee44aa1 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -3,7 +3,7 @@ * The programplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/programplan/lang/vi.php b/module/programplan/lang/vi.php index 37a10b3e13..4f9ee44aa1 100644 --- a/module/programplan/lang/vi.php +++ b/module/programplan/lang/vi.php @@ -3,7 +3,7 @@ * The programplan module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index 2f5390d35e..e1352b4db9 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -3,7 +3,7 @@ * The programplan module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/programplan/lang/zh-tw.php b/module/programplan/lang/zh-tw.php index 3a638b8c2c..c951235dd4 100644 --- a/module/programplan/lang/zh-tw.php +++ b/module/programplan/lang/zh-tw.php @@ -3,7 +3,7 @@ * The programplan module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: zh-tw.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/programplan/model.php b/module/programplan/model.php index ed8eb2df8a..b0a2e30ed7 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -3,7 +3,7 @@ * The model file of programplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: model.php 5079 2013-07-10 00:44:34Z chencongzhi520@gmail.com $ diff --git a/module/programplan/view/browse.html.php b/module/programplan/view/browse.html.php index b38b2cf2d9..5a299d37f0 100644 --- a/module/programplan/view/browse.html.php +++ b/module/programplan/view/browse.html.php @@ -3,7 +3,7 @@ * The browse of programplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: browse.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index c95a562a64..4a76ec2dbf 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -3,7 +3,7 @@ * The create of programplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: create.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index e9141ff653..2717fa249b 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -3,7 +3,7 @@ * The edit of programplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: edit.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index e900dd3c77..2bc407ad27 100644 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -3,7 +3,7 @@ * The gantt of programplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: gantt.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/programplan/view/list.html.php b/module/programplan/view/list.html.php index 4a2200b0b6..9ed1889add 100644 --- a/module/programplan/view/list.html.php +++ b/module/programplan/view/list.html.php @@ -3,7 +3,7 @@ * The list of programplan module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package programplan * @version $Id: list.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/project/control.php b/module/project/control.php index 69dabdd709..666351ace5 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1993,4 +1993,20 @@ class project extends control } echo json_encode($response); } + + /** + * AJAX: get executions of a project in html select. + * + * @param int $projectID + * @param int $executionID + * @access public + * @return void + */ + public function ajaxGetExecutions($projectID, $executionID = 0) + { + $executions = array('' => '') + $this->loadModel('execution')->getPairs($projectID, 'all'); + + if($this->app->getViewType() == 'json') return print(json_encode($executionList)); + return print(html::select('execution', $executions, $executionID, "class='form-control'")); + } } diff --git a/module/project/model.php b/module/project/model.php index e46187d781..70d521562f 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1582,13 +1582,18 @@ class projectModel extends model $oldProject = $this->getById($projectID, $type); $now = helper::now(); + $editorIdList = $this->config->project->editor->start['id']; + if($this->app->rawModule == 'program') $editorIdList = $this->config->program->editor->start['id']; + $project = fixer::input('post') ->add('id', $projectID) ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) + ->stripTags($editorIdList, $this->config->allowedTags) ->remove('comment')->get(); + $project = $this->loadModel('file')->processImgURL($project, $editorIdList, $this->post->uid); $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck() ->check($this->config->project->start->requiredFields, 'notempty') @@ -1640,15 +1645,20 @@ class projectModel extends model */ public function suspend($projectID) { + $editorIdList = $this->config->project->editor->suspend['id']; + if($this->app->rawModule == 'program') $editorIdList = $this->config->program->editor->suspend['id']; + $oldProject = $this->getById($projectID); - $project = fixer::input('post') + $project = fixer::input('post') ->add('id', $projectID) ->setDefault('status', 'suspended') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) ->setDefault('suspendedDate', helper::today()) + ->stripTags($editorIdList, $this->config->allowedTags) ->remove('comment')->get(); + $project = $this->loadModel('file')->processImgURL($project, $editorIdList, $this->post->uid); $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck() ->checkFlow() @@ -1670,6 +1680,9 @@ class projectModel extends model $oldProject = $this->getById($projectID); $now = helper::now(); + $editorIdList = $this->config->project->editor->activate['id']; + if($this->app->rawModule == 'program') $editorIdList = $this->config->program->editor->activate['id']; + $project = fixer::input('post') ->add('id', $projectID) ->setDefault('realEnd','') @@ -1677,6 +1690,7 @@ class projectModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->setIF($oldProject->realBegan == '0000-00-00', 'realBegan', helper::today()) + ->stripTags($editorIdList, $this->config->allowedTags) ->remove('comment,readjustTime,readjustTask') ->get(); @@ -1686,6 +1700,7 @@ class projectModel extends model unset($project->end); } + $project = $this->loadModel('file')->processImgURL($project, $editorIdList, $this->post->uid); $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck() ->checkFlow() @@ -1742,6 +1757,9 @@ class projectModel extends model $oldProject = $this->getById($projectID); $now = helper::now(); + $editorIdList = $this->config->project->editor->close['id']; + if($this->app->rawModule == 'program') $editorIdList = $this->config->program->editor->close['id']; + $project = fixer::input('post') ->add('id', $projectID) ->setDefault('status', 'closed') @@ -1749,11 +1767,14 @@ class projectModel extends model ->setDefault('closedDate', $now) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) + ->stripTags($editorIdList, $this->config->allowedTags) ->remove('comment') ->get(); $this->lang->error->ge = $this->lang->project->ge; + $project = $this->loadModel('file')->processImgURL($project, $editorIdList, $this->post->uid); + $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck() ->check($this->config->project->close->requiredFields, 'notempty') diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index 082fe99d56..1cced9f528 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -3,7 +3,7 @@ * The suspend file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 25a066f270..862f412be2 100644 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -3,7 +3,7 @@ * The prjbatchedit view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package project * @version $Id: prjbatchedit.html.php 4769 2021-02-020 11:13:21Z $ diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php index 03552f0b13..66829e5160 100644 --- a/module/project/view/browse.html.php +++ b/module/project/view/browse.html.php @@ -3,7 +3,7 @@ * The prjbrowse view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: prjbrowse.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php index 4b5c860d15..d560e60cd1 100644 --- a/module/project/view/browsebycard.html.php +++ b/module/project/view/browsebycard.html.php @@ -3,7 +3,7 @@ * The browsebycard view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package project * @version $Id: browsebycard.html.php 4769 2021-07-23 11:29:21Z $ diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php index 7de66d983b..b97dce0a92 100644 --- a/module/project/view/browsebylist.html.php +++ b/module/project/view/browsebylist.html.php @@ -3,7 +3,7 @@ * The browsebylist view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package project * @version $Id: browsebylist.html.php 4769 2021-07-23 11:16:21Z $ diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 7f20454148..514ad41591 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -3,7 +3,7 @@ * The bug view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: bug.html.php 4894 2013-06-25 01:28:39Z wyd621@gmail.com $ diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 1efdd1c355..69dcb7be6e 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -3,7 +3,7 @@ * The build view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: build.html.php 4262 2013-01-24 08:48:56Z chencongzhi520@gmail.com $ diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php index 0fd52dabdd..be3ae4f7ed 100644 --- a/module/project/view/close.html.php +++ b/module/project/view/close.html.php @@ -3,7 +3,7 @@ * The suspend file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 444a8cf859..f961aa09f3 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: create.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/project/view/createstakeholder.html.php b/module/project/view/createstakeholder.html.php index 969b0f7322..a59de78d0d 100644 --- a/module/project/view/createstakeholder.html.php +++ b/module/project/view/createstakeholder.html.php @@ -3,7 +3,7 @@ * The create stakeholder view of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php index 11e7b048d5..0edb7f5bc9 100755 --- a/module/project/view/dynamic.html.php +++ b/module/project/view/dynamic.html.php @@ -3,7 +3,7 @@ * The action->dynamic view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $ diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 741b6ac9e2..127b374d5f 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -3,7 +3,7 @@ * The prjedit view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id diff --git a/module/project/view/export.html.php b/module/project/view/export.html.php index b1c32b73eb..2ca78f6097 100644 --- a/module/project/view/export.html.php +++ b/module/project/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id$ diff --git a/module/project/view/group.html.php b/module/project/view/group.html.php index 827b65f735..f8acb232bb 100644 --- a/module/project/view/group.html.php +++ b/module/project/view/group.html.php @@ -3,7 +3,7 @@ * The prigroup view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: prigroup.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index f9ec0d0536..a7ef0618f7 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php index 661a1f40a1..df01db0849 100644 --- a/module/project/view/kanban.html.php +++ b/module/project/view/kanban.html.php @@ -3,7 +3,7 @@ * The html product kanban file of kanban method of product module of ZenTaoPMS. * * @copyright Copyright 2021-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id diff --git a/module/project/view/managepriv.html.php b/module/project/view/managepriv.html.php index 789745151a..c6cee6cf52 100644 --- a/module/project/view/managepriv.html.php +++ b/module/project/view/managepriv.html.php @@ -3,7 +3,7 @@ * The manage privilege view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package group * @version $Id: managepriv.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index 433de3a69d..cc9cbc8f2a 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -3,7 +3,7 @@ * The manage prjmanageproducts view of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id diff --git a/module/project/view/manageview.html.php b/module/project/view/manageview.html.php index 7c260cfc60..790869d5f6 100644 --- a/module/project/view/manageview.html.php +++ b/module/project/view/manageview.html.php @@ -3,7 +3,7 @@ * The manage view by project view of group module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package group * @version $Id: managepriv.html.php 1517 2011-03-07 10:02:57Z wwccss $ diff --git a/module/project/view/programtitle.html.php b/module/project/view/programtitle.html.php index 2bc8ae2eca..5b99fec123 100644 --- a/module/project/view/programtitle.html.php +++ b/module/project/view/programtitle.html.php @@ -3,7 +3,7 @@ * The prjprojecttitle view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: prjprojecttitle.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php index b54562efab..372bf6de71 100644 --- a/module/project/view/start.html.php +++ b/module/project/view/start.html.php @@ -3,7 +3,7 @@ * The prjstart view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: prjstart.html.php 4769 2013-05-05 07:24:21Z wwccss $ diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php index fefae82bd5..9ae076a2b6 100644 --- a/module/project/view/suspend.html.php +++ b/module/project/view/suspend.html.php @@ -3,7 +3,7 @@ * The suspend file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 527dac4e7f..695bf8ee1c 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -3,7 +3,7 @@ * The team view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Qiyu Xie * @package project * @version $Id: team.html.php 4143 2021-08-11 11:01:06Z $ diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index f0124f1269..2767c461f3 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -3,7 +3,7 @@ * The browse view file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: browse.html.php 1914 2011-06-24 10:11:25Z yidong@cnezsoft.com $ diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index cca23ade7a..d995f5d084 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -3,7 +3,7 @@ * The view method view file of project module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package project * @version $Id: view.html.php 4594 2013-03-13 06:16:02Z wyd621@gmail.com $ diff --git a/module/projectbuild/lang/de.php b/module/projectbuild/lang/de.php index 91d431abba..b26ec0d136 100644 --- a/module/projectbuild/lang/de.php +++ b/module/projectbuild/lang/de.php @@ -3,7 +3,7 @@ * The project build module en file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package projectrelease * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectbuild/lang/en.php b/module/projectbuild/lang/en.php index 91d431abba..b26ec0d136 100644 --- a/module/projectbuild/lang/en.php +++ b/module/projectbuild/lang/en.php @@ -3,7 +3,7 @@ * The project build module en file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package projectrelease * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectbuild/lang/fr.php b/module/projectbuild/lang/fr.php index 91d431abba..b26ec0d136 100644 --- a/module/projectbuild/lang/fr.php +++ b/module/projectbuild/lang/fr.php @@ -3,7 +3,7 @@ * The project build module en file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package projectrelease * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectbuild/lang/vi.php b/module/projectbuild/lang/vi.php index 91d431abba..b26ec0d136 100644 --- a/module/projectbuild/lang/vi.php +++ b/module/projectbuild/lang/vi.php @@ -3,7 +3,7 @@ * The project build module en file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package projectrelease * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php index 802e90f069..9778b8b404 100644 --- a/module/projectbuild/lang/zh-cn.php +++ b/module/projectbuild/lang/zh-cn.php @@ -3,7 +3,7 @@ * The project build module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package projectrelease * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectbuild/lang/zh-tw.php b/module/projectbuild/lang/zh-tw.php index a3e2b33848..34379a49b6 100644 --- a/module/projectbuild/lang/zh-tw.php +++ b/module/projectbuild/lang/zh-tw.php @@ -3,7 +3,7 @@ * The project build module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package projectrelease * @version $Id: zh-tw.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index eb2ffe6ede..b6d1094b73 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -3,7 +3,7 @@ * The control file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: control.php 4178 2013-01-20 09:32:11Z wwccss $ diff --git a/module/projectrelease/lang/de.php b/module/projectrelease/lang/de.php index 6244d80627..0367551d7c 100644 --- a/module/projectrelease/lang/de.php +++ b/module/projectrelease/lang/de.php @@ -3,7 +3,7 @@ * The release module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/lang/en.php b/module/projectrelease/lang/en.php index ac2778188d..33e82bde68 100644 --- a/module/projectrelease/lang/en.php +++ b/module/projectrelease/lang/en.php @@ -3,7 +3,7 @@ * The release module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/lang/fr.php b/module/projectrelease/lang/fr.php index 083d0258fb..9430e39a40 100644 --- a/module/projectrelease/lang/fr.php +++ b/module/projectrelease/lang/fr.php @@ -3,7 +3,7 @@ * The release module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/lang/vi.php b/module/projectrelease/lang/vi.php index 0e3ada97dc..eae011e6be 100644 --- a/module/projectrelease/lang/vi.php +++ b/module/projectrelease/lang/vi.php @@ -3,7 +3,7 @@ * The release module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php index baf428e459..c9b07c9de1 100644 --- a/module/projectrelease/lang/zh-cn.php +++ b/module/projectrelease/lang/zh-cn.php @@ -3,7 +3,7 @@ * The release module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/lang/zh-tw.php b/module/projectrelease/lang/zh-tw.php index c5615ae7e1..381ba0b5e5 100644 --- a/module/projectrelease/lang/zh-tw.php +++ b/module/projectrelease/lang/zh-tw.php @@ -3,7 +3,7 @@ * The release module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2020 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: zh-tw.php 4129 2020-11-27 01:58:14Z wwccss $ diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 5f39246a35..1eaeb927b0 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -3,7 +3,7 @@ * The model file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: model.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php index d1cdf912d6..55e4f8108e 100644 --- a/module/projectrelease/view/browse.html.php +++ b/module/projectrelease/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package release * @version $Id: browse.html.php 4129 2020-11-25 11:58:14Z wwccss $ diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php index 2f1bc25005..85aa85f6f3 100644 --- a/module/projectrelease/view/create.html.php +++ b/module/projectrelease/view/create.html.php @@ -3,7 +3,7 @@ * The create view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/projectrelease/view/edit.html.php b/module/projectrelease/view/edit.html.php index 5487ac56fc..cdd1be55c7 100644 --- a/module/projectrelease/view/edit.html.php +++ b/module/projectrelease/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/projectrelease/view/export.html.php b/module/projectrelease/view/export.html.php index b82858bee7..5102e39f29 100755 --- a/module/projectrelease/view/export.html.php +++ b/module/projectrelease/view/export.html.php @@ -3,7 +3,7 @@ * The export stories or bugs to html view file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/projectrelease/view/linkbug.html.php b/module/projectrelease/view/linkbug.html.php index 9ed6c81f62..0081dc6d41 100644 --- a/module/projectrelease/view/linkbug.html.php +++ b/module/projectrelease/view/linkbug.html.php @@ -3,7 +3,7 @@ * The link bug view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package release * @version $Id: linkbug.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php index c6caa3ac06..c417769aa2 100644 --- a/module/projectrelease/view/linkstory.html.php +++ b/module/projectrelease/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package release * @version $Id: linkstory.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/projectrelease/view/notify.html.php b/module/projectrelease/view/notify.html.php index 58c4b23017..0a3fc5b20e 100644 --- a/module/projectrelease/view/notify.html.php +++ b/module/projectrelease/view/notify.html.php @@ -3,7 +3,7 @@ * The notify file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package bug * @version $Id: notify.html.php 4129 2021-12-01 01:58:14Z wwccss $ diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php index 4f6d1ce6e1..e7fd0c2722 100644 --- a/module/projectrelease/view/view.html.php +++ b/module/projectrelease/view/view.html.php @@ -3,7 +3,7 @@ * The view file of release module's view method of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: view.html.php 4386 2013-02-19 07:37:45Z chencongzhi520@gmail.com $ diff --git a/module/projectstory/model.php b/module/projectstory/model.php index 834b23e358..45d68f9b95 100644 --- a/module/projectstory/model.php +++ b/module/projectstory/model.php @@ -3,7 +3,7 @@ * The model file of projectStory module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package projectStory * @version $Id diff --git a/module/qa/control.php b/module/qa/control.php index f520f1c4d6..320b3fff06 100644 --- a/module/qa/control.php +++ b/module/qa/control.php @@ -3,7 +3,7 @@ * The control file of qa module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package qa * @version $Id: control.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/qa/lang/de.php b/module/qa/lang/de.php index 6becfe71c6..79e735a132 100644 --- a/module/qa/lang/de.php +++ b/module/qa/lang/de.php @@ -3,7 +3,7 @@ * The qa module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php index 82934725fa..c260bc32f3 100644 --- a/module/qa/lang/en.php +++ b/module/qa/lang/en.php @@ -3,7 +3,7 @@ * The qa module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/qa/lang/fr.php b/module/qa/lang/fr.php index 2ca6ab5c9f..ab3024ba4f 100644 --- a/module/qa/lang/fr.php +++ b/module/qa/lang/fr.php @@ -3,7 +3,7 @@ * The qa module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/qa/lang/zh-cn.php b/module/qa/lang/zh-cn.php index eb6b7390cf..99a9860dcf 100644 --- a/module/qa/lang/zh-cn.php +++ b/module/qa/lang/zh-cn.php @@ -3,7 +3,7 @@ * The qa module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/qa/lang/zh-tw.php b/module/qa/lang/zh-tw.php index 1be7510bcf..4a9990ac19 100644 --- a/module/qa/lang/zh-tw.php +++ b/module/qa/lang/zh-tw.php @@ -3,7 +3,7 @@ * The qa module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/qa/model.php b/module/qa/model.php index 92e8924375..f807bbce06 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -3,7 +3,7 @@ * The model file of qa module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package qa * @version $Id$ diff --git a/module/qa/view/index.html.php b/module/qa/view/index.html.php index e4e30165b4..ed3f6be61f 100644 --- a/module/qa/view/index.html.php +++ b/module/qa/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of company module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package company * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/control.php b/module/release/control.php index 105f01bf84..a68c808123 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -3,7 +3,7 @@ * The control file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: control.php 4178 2013-01-20 09:32:11Z wwccss $ diff --git a/module/release/lang/de.php b/module/release/lang/de.php index d131e43f06..25d5482914 100644 --- a/module/release/lang/de.php +++ b/module/release/lang/de.php @@ -3,7 +3,7 @@ * The release module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 5ebeea5f34..2a3824a08c 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -3,7 +3,7 @@ * The release module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php index f1d3203f0d..8c1cc280d7 100644 --- a/module/release/lang/fr.php +++ b/module/release/lang/fr.php @@ -3,7 +3,7 @@ * The release module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 149a5921c2..da700453d3 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -3,7 +3,7 @@ * The release module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php index a6243c3f1b..686384c602 100644 --- a/module/release/lang/zh-tw.php +++ b/module/release/lang/zh-tw.php @@ -3,7 +3,7 @@ * The release module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/model.php b/module/release/model.php index 67a0c2fe0a..eab87b9dd1 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -3,7 +3,7 @@ * The model file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: model.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 4444a5242b..f28acb9dfa 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: browse.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php index 70466f980c..fae48e175d 100644 --- a/module/release/view/create.html.php +++ b/module/release/view/create.html.php @@ -3,7 +3,7 @@ * The create view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php index 7919355340..efc184ee44 100644 --- a/module/release/view/edit.html.php +++ b/module/release/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/release/view/export.html.php b/module/release/view/export.html.php index b82858bee7..5102e39f29 100755 --- a/module/release/view/export.html.php +++ b/module/release/view/export.html.php @@ -3,7 +3,7 @@ * The export stories or bugs to html view file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php index ac3effbfe9..4c06532b6d 100644 --- a/module/release/view/linkbug.html.php +++ b/module/release/view/linkbug.html.php @@ -3,7 +3,7 @@ * The link bug view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package release * @version $Id: linkbug.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index a2979b2f87..aa0e2b177f 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of release module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package release * @version $Id: linkstory.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/release/view/notify.html.php b/module/release/view/notify.html.php index 58c4b23017..0a3fc5b20e 100644 --- a/module/release/view/notify.html.php +++ b/module/release/view/notify.html.php @@ -3,7 +3,7 @@ * The notify file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package bug * @version $Id: notify.html.php 4129 2021-12-01 01:58:14Z wwccss $ diff --git a/module/release/view/sendmail.html.php b/module/release/view/sendmail.html.php index 73ca450be9..5afb111bdb 100644 --- a/module/release/view/sendmail.html.php +++ b/module/release/view/sendmail.html.php @@ -3,7 +3,7 @@ * The mail file of release module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package release * @version $Id: sendmail.html.php 867 2021-08-12 13:37:58Z $ diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 71a3c84d30..baea1be218 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -3,7 +3,7 @@ * The view file of release module's view method of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package release * @version $Id: view.html.php 4386 2013-02-19 07:37:45Z chencongzhi520@gmail.com $ diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php index 31f5e558c3..2c7843b1d1 100644 --- a/module/repo/view/edit.html.php +++ b/module/repo/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of repo module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package repo * @version $Id$ diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php index 5854740348..5f1f6af6f6 100644 --- a/module/repo/view/maintain.html.php +++ b/module/repo/view/maintain.html.php @@ -3,7 +3,7 @@ * The browse view file of repo module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package repo * @version $Id$ diff --git a/module/repo/view/setrules.html.php b/module/repo/view/setrules.html.php index 9e5c399769..7f4e1603f5 100644 --- a/module/repo/view/setrules.html.php +++ b/module/repo/view/setrules.html.php @@ -3,7 +3,7 @@ * The setRules view file of repo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package repo * @version $Id$ diff --git a/module/report/control.php b/module/report/control.php index 735b387311..d5de7198bc 100644 --- a/module/report/control.php +++ b/module/report/control.php @@ -3,7 +3,7 @@ * The control file of report module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: control.php 4622 2013-03-28 01:09:02Z chencongzhi520@gmail.com $ diff --git a/module/report/lang/de.php b/module/report/lang/de.php index 3ad1a361c2..9f543195da 100644 --- a/module/report/lang/de.php +++ b/module/report/lang/de.php @@ -3,7 +3,7 @@ * The report module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 54f2ce32d1..b2c6275cf3 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -3,7 +3,7 @@ * The report module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ diff --git a/module/report/lang/fr.php b/module/report/lang/fr.php index aacf898479..850b66da03 100644 --- a/module/report/lang/fr.php +++ b/module/report/lang/fr.php @@ -3,7 +3,7 @@ * The report module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 18413a8978..b7988f9880 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -3,7 +3,7 @@ * The report module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: zh-cn.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php index 919635c2c3..ec56a9cfb9 100644 --- a/module/report/lang/zh-tw.php +++ b/module/report/lang/zh-tw.php @@ -3,7 +3,7 @@ * The report module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: zh-tw.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ diff --git a/module/report/model.php b/module/report/model.php index 69047be94a..09bbe4d89c 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -3,7 +3,7 @@ * The model file of report module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package report * @version $Id: model.php 4726 2013-05-03 05:51:27Z chencongzhi520@gmail.com $ diff --git a/module/score/view/reset.html.php b/module/score/view/reset.html.php index 0b8647cf6e..569f85d8e5 100644 --- a/module/score/view/reset.html.php +++ b/module/score/view/reset.html.php @@ -2,7 +2,7 @@ /** * The reset view file of score module of ZenTaoPMS. * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Memory * @package score * @version $Id$ diff --git a/module/score/view/rule.html.php b/module/score/view/rule.html.php index c668e44a9d..6a19594b08 100644 --- a/module/score/view/rule.html.php +++ b/module/score/view/rule.html.php @@ -2,7 +2,7 @@ /** * The reset view file of score module of ZenTaoPMS. * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Memory * @package score * @version $Id$ diff --git a/module/search/control.php b/module/search/control.php index 14425eb982..e49010ed7c 100644 --- a/module/search/control.php +++ b/module/search/control.php @@ -3,7 +3,7 @@ * The control file of search module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: control.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/lang/de.php b/module/search/lang/de.php index 6097774685..506fc6d947 100644 --- a/module/search/lang/de.php +++ b/module/search/lang/de.php @@ -3,7 +3,7 @@ * The search module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 08ff3534ec..794fb39cbf 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -3,7 +3,7 @@ * The search module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php index 47970e082f..2f854955d1 100644 --- a/module/search/lang/fr.php +++ b/module/search/lang/fr.php @@ -3,7 +3,7 @@ * The search module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php index 0b2c62b643..67106e3256 100644 --- a/module/search/lang/zh-cn.php +++ b/module/search/lang/zh-cn.php @@ -3,7 +3,7 @@ * The search module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php index 9e7280d345..b0bcb3687f 100644 --- a/module/search/lang/zh-tw.php +++ b/module/search/lang/zh-tw.php @@ -3,7 +3,7 @@ * The search module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/model.php b/module/search/model.php index 5605abff9c..0d58ea642e 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -3,7 +3,7 @@ * The model file of search module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: model.php 5082 2013-07-10 01:14:45Z wyd621@gmail.com $ diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index d2e6cbe7da..3cafd8601d 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -3,7 +3,7 @@ * The buildform view of search module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package search * @version $Id: buildform.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/search/view/savequery.html.php b/module/search/view/savequery.html.php index 6f1de90691..0e645f4e74 100644 --- a/module/search/view/savequery.html.php +++ b/module/search/view/savequery.html.php @@ -3,7 +3,7 @@ * The save query view file of search module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package search * @version $Id$ diff --git a/module/setting/control.php b/module/setting/control.php index 49ac2b1349..df1b4a4d5d 100644 --- a/module/setting/control.php +++ b/module/setting/control.php @@ -3,7 +3,7 @@ * The control file of setting of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package setting * @version $Id$ diff --git a/module/setting/model.php b/module/setting/model.php index 1b28086680..cfbf2020e3 100644 --- a/module/setting/model.php +++ b/module/setting/model.php @@ -3,7 +3,7 @@ * The model file of setting module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package setting * @version $Id: model.php 4976 2013-07-02 08:15:31Z wyd621@gmail.com $ diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index b40685e53c..3d7a018851 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -3,7 +3,7 @@ * The control file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yanyi Cao * @package sonarqube * @version $Id: ${FILE_NAME} 5144 2022/1/11 8:55 上午 caoyanyi@easycorp.ltd $ diff --git a/module/sonarqube/model.php b/module/sonarqube/model.php index 60fc32ae02..06170bd973 100644 --- a/module/sonarqube/model.php +++ b/module/sonarqube/model.php @@ -3,7 +3,7 @@ * The model file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yanyi Cao * @package sonarqube * @version $Id: $ diff --git a/module/sonarqube/view/browse.html.php b/module/sonarqube/view/browse.html.php index d13ac1fd5a..712799e694 100644 --- a/module/sonarqube/view/browse.html.php +++ b/module/sonarqube/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yanyi Cao * @package sonarqube * @version $Id$ diff --git a/module/sonarqube/view/browseissue.html.php b/module/sonarqube/view/browseissue.html.php index 1ab0416bc0..b2d75b1118 100644 --- a/module/sonarqube/view/browseissue.html.php +++ b/module/sonarqube/view/browseissue.html.php @@ -3,7 +3,7 @@ * The browse view file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package sonarqube * @version $Id$ diff --git a/module/sonarqube/view/browseproject.html.php b/module/sonarqube/view/browseproject.html.php index 5d61030b09..3a9b8ed215 100644 --- a/module/sonarqube/view/browseproject.html.php +++ b/module/sonarqube/view/browseproject.html.php @@ -3,7 +3,7 @@ * The browse view file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package sonarqube * @version $Id$ diff --git a/module/sonarqube/view/create.html.php b/module/sonarqube/view/create.html.php index c52905396b..5404fddea5 100644 --- a/module/sonarqube/view/create.html.php +++ b/module/sonarqube/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package sonarqube * @version $Id$ diff --git a/module/sonarqube/view/createproject.html.php b/module/sonarqube/view/createproject.html.php index b418e2aaa9..e621422142 100644 --- a/module/sonarqube/view/createproject.html.php +++ b/module/sonarqube/view/createproject.html.php @@ -3,7 +3,7 @@ * The create view file of protect tag of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package sonarqube * @version $Id$ diff --git a/module/sonarqube/view/edit.html.php b/module/sonarqube/view/edit.html.php index 3649ea1bc3..6387b70dff 100644 --- a/module/sonarqube/view/edit.html.php +++ b/module/sonarqube/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of sonarqube module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Zeng * @package sonarqube * @version $Id$ diff --git a/module/sonarqube/view/reportview.html.php b/module/sonarqube/view/reportview.html.php index fc3d013056..fa32d5f438 100644 --- a/module/sonarqube/view/reportview.html.php +++ b/module/sonarqube/view/reportview.html.php @@ -3,7 +3,7 @@ * The reprot file of sonarqubemodule of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package sonarqube * @version $Id: reprotview.html.php 935 2022-01-25 10:52:24Z liyuchun@easycorp.ltd $ diff --git a/module/sso/control.php b/module/sso/control.php index e073bece90..8449393b55 100644 --- a/module/sso/control.php +++ b/module/sso/control.php @@ -3,7 +3,7 @@ * The control file of sso module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id: control.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ diff --git a/module/sso/lang/de.php b/module/sso/lang/de.php index 28ad947731..512788d333 100644 --- a/module/sso/lang/de.php +++ b/module/sso/lang/de.php @@ -3,7 +3,7 @@ * The sso module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id$ diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php index 4e6dbd5754..dd60a89c5a 100644 --- a/module/sso/lang/en.php +++ b/module/sso/lang/en.php @@ -3,7 +3,7 @@ * The sso module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id$ diff --git a/module/sso/lang/fr.php b/module/sso/lang/fr.php index 796611c219..65da0e9640 100644 --- a/module/sso/lang/fr.php +++ b/module/sso/lang/fr.php @@ -3,7 +3,7 @@ * The sso module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id$ diff --git a/module/sso/lang/zh-cn.php b/module/sso/lang/zh-cn.php index 2cad5b1681..ef12dec968 100644 --- a/module/sso/lang/zh-cn.php +++ b/module/sso/lang/zh-cn.php @@ -3,7 +3,7 @@ * The sso module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id$ diff --git a/module/sso/lang/zh-tw.php b/module/sso/lang/zh-tw.php index 16c485b13d..d8d418a208 100644 --- a/module/sso/lang/zh-tw.php +++ b/module/sso/lang/zh-tw.php @@ -3,7 +3,7 @@ * The sso module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id$ diff --git a/module/sso/view/bind.html.php b/module/sso/view/bind.html.php index 69f8a1120e..47eed58c1f 100644 --- a/module/sso/view/bind.html.php +++ b/module/sso/view/bind.html.php @@ -3,7 +3,7 @@ * The bind view file of sso module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package sso * @version $Id$ diff --git a/module/sso/view/error.html.php b/module/sso/view/error.html.php index cd6e33b62c..368495838e 100644 --- a/module/sso/view/error.html.php +++ b/module/sso/view/error.html.php @@ -3,7 +3,7 @@ * The html template file of deny method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/stage/control.php b/module/stage/control.php index 15132571d3..52090d22ff 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -3,7 +3,7 @@ * The control file of stage currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: control.php 5107 2013-07-12 01:46:12Z chencongzhi520@gmail.com $ diff --git a/module/stage/lang/de.php b/module/stage/lang/de.php index f11a49dfd9..c13f128b52 100644 --- a/module/stage/lang/de.php +++ b/module/stage/lang/de.php @@ -3,7 +3,7 @@ * The stage module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/stage/lang/en.php b/module/stage/lang/en.php index 1d7d97afbf..52383a6b77 100644 --- a/module/stage/lang/en.php +++ b/module/stage/lang/en.php @@ -3,7 +3,7 @@ * The stage module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/stage/lang/fr.php b/module/stage/lang/fr.php index f11a49dfd9..c13f128b52 100644 --- a/module/stage/lang/fr.php +++ b/module/stage/lang/fr.php @@ -3,7 +3,7 @@ * The stage module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/stage/lang/vi.php b/module/stage/lang/vi.php index f11a49dfd9..c13f128b52 100644 --- a/module/stage/lang/vi.php +++ b/module/stage/lang/vi.php @@ -3,7 +3,7 @@ * The stage module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php index 1911adaf2a..7b1c685901 100644 --- a/module/stage/lang/zh-cn.php +++ b/module/stage/lang/zh-cn.php @@ -3,7 +3,7 @@ * The stage module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/stage/lang/zh-tw.php b/module/stage/lang/zh-tw.php index e4e73d5f49..712a9bd616 100644 --- a/module/stage/lang/zh-tw.php +++ b/module/stage/lang/zh-tw.php @@ -3,7 +3,7 @@ * The stage module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: zh-tw.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ diff --git a/module/stage/model.php b/module/stage/model.php index 564730200d..9baa81b443 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -3,7 +3,7 @@ * The model file of stage module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: model.php 5079 2013-07-10 00:44:34Z chencongzhi520@gmail.com $ diff --git a/module/stage/view/batchcreate.html.php b/module/stage/view/batchcreate.html.php index 72687b7b35..90211cea1d 100644 --- a/module/stage/view/batchcreate.html.php +++ b/module/stage/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batchCreate view of stage module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: batchCreate.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/stage/view/browse.html.php b/module/stage/view/browse.html.php index b60412afff..7f6dab74d4 100644 --- a/module/stage/view/browse.html.php +++ b/module/stage/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view of stage module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: browse.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/stage/view/create.html.php b/module/stage/view/create.html.php index 3d53f89f39..e63a51366c 100644 --- a/module/stage/view/create.html.php +++ b/module/stage/view/create.html.php @@ -3,7 +3,7 @@ * The create view of stage module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: create.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/stage/view/edit.html.php b/module/stage/view/edit.html.php index 05c393bdbb..8fc7f4c261 100644 --- a/module/stage/view/edit.html.php +++ b/module/stage/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of stage module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: edit.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/stage/view/settype.html.php b/module/stage/view/settype.html.php index 75d234e5be..eceaac8dd0 100644 --- a/module/stage/view/settype.html.php +++ b/module/stage/view/settype.html.php @@ -3,7 +3,7 @@ * The setType view of stage module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package stage * @version $Id: setType.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ diff --git a/module/stakeholder/view/batchcreate.html.php b/module/stakeholder/view/batchcreate.html.php index 26b04d6cb6..939cc67489 100644 --- a/module/stakeholder/view/batchcreate.html.php +++ b/module/stakeholder/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create stakeholder view of stakeholder module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php index f51394f4b6..3e7e69c046 100644 --- a/module/stakeholder/view/browse.html.php +++ b/module/stakeholder/view/browse.html.php @@ -3,7 +3,7 @@ * The view view of stakeholder module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/stakeholder/view/communicate.html.php b/module/stakeholder/view/communicate.html.php index 140e0d5fb8..b8279b65cf 100644 --- a/module/stakeholder/view/communicate.html.php +++ b/module/stakeholder/view/communicate.html.php @@ -3,7 +3,7 @@ * The complete file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: complete.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/stakeholder/view/create.html.php b/module/stakeholder/view/create.html.php index 30fc5378cd..f42f33875a 100644 --- a/module/stakeholder/view/create.html.php +++ b/module/stakeholder/view/create.html.php @@ -3,7 +3,7 @@ * The view view of stakeholder module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 5096 2013-07-11 07:02:43Z chencongzhi520@gmail.com $ diff --git a/module/stakeholder/view/expect.html.php b/module/stakeholder/view/expect.html.php index 8ec23b666f..0922524f63 100644 --- a/module/stakeholder/view/expect.html.php +++ b/module/stakeholder/view/expect.html.php @@ -3,7 +3,7 @@ * The complete file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: complete.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/stakeholder/view/userissue.html.php b/module/stakeholder/view/userissue.html.php index 8cd666e3eb..b9a32ee60b 100644 --- a/module/stakeholder/view/userissue.html.php +++ b/module/stakeholder/view/userissue.html.php @@ -3,7 +3,7 @@ * The view view of stakeholder module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology C - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package company * @version $Id: edit.html.php 4488 2013-02-27 02:54:49Z chencongzhi520@gmail.com $ diff --git a/module/stakeholder/view/view.html.php b/module/stakeholder/view/view.html.php index 38698e9da5..d4e30bc966 100644 --- a/module/stakeholder/view/view.html.php +++ b/module/stakeholder/view/view.html.php @@ -3,7 +3,7 @@ * The view view of stakeholder module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology C - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package company * @version $Id: edit.html.php 4488 2013-02-27 02:54:49Z chencongzhi520@gmail.com $ diff --git a/module/story/control.php b/module/story/control.php index 06f78c29c3..7ab1f7ecf6 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -3,7 +3,7 @@ * The control file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: control.php 5145 2013-07-15 06:47:26Z chencongzhi520@gmail.com $ diff --git a/module/story/lang/de.php b/module/story/lang/de.php index cc03af2f52..2fee3b5fde 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -3,7 +3,7 @@ * The story module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 77f3a2789a..202d2b1ff4 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -3,7 +3,7 @@ * The story module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index ddf90f0679..182a44d4c9 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -3,7 +3,7 @@ * The story module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index ce3c57d13f..5eb09ccdb2 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -3,7 +3,7 @@ * The story module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: zh-cn.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ @@ -98,7 +98,7 @@ $lang->story->sourceNote = '来源备注'; $lang->story->fromBug = '来源Bug'; $lang->story->title = "{$lang->SRCommon}名称"; $lang->story->type = "需求类型"; -$lang->story->category = "类型"; +$lang->story->category = "类别"; $lang->story->color = '标题颜色'; $lang->story->toBug = '转Bug'; $lang->story->spec = "描述"; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index ce380f2a41..ae595fa813 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -3,7 +3,7 @@ * The story module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: zh-tw.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ diff --git a/module/story/model.php b/module/story/model.php index 04b6e22d90..f5bea613da 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3,7 +3,7 @@ * The model file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: model.php 5145 2013-07-15 06:47:26Z chencongzhi520@gmail.com $ @@ -830,7 +830,6 @@ class storyModel extends model if(isset($story->stage) and $oldStory->stage != $story->stage) $story->stagedBy = (strpos('tested|verified|released|closed', $story->stage) !== false) ? $this->app->user->account : ''; $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->edit['id'], $this->post->uid); - if(isset($_POST['reviewer'])) { $_POST['reviewer'] = array_filter($_POST['reviewer']); @@ -1327,6 +1326,7 @@ class storyModel extends model ->setDefault('lastEditedDate', $now) ->setDefault('status', $oldStory->status) ->setDefault('reviewedDate', $date) + ->stripTags($this->config->story->editor->review['id'], $this->config->allowedTags) ->setIF($this->post->result == 'revert', 'version', $this->post->preVersion) ->setIF($this->post->result == 'clarify', 'assignedTo', $oldStory->lastEditedBy ? $oldStory->lastEditedBy : $oldStory->openedBy) ->removeIF($this->post->result != 'reject', 'closedReason, duplicateStory, childStories') @@ -1336,6 +1336,7 @@ class storyModel extends model ->add('id', $storyID) ->remove('result,preVersion,comment') ->get(); + $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->review['id'], $this->post->uid); /* Fix bug #671. */ $this->lang->story->closedReason = $this->lang->story->rejectedReason; @@ -1563,6 +1564,7 @@ class storyModel extends model ->setDefault('closedDate', $now) ->setDefault('closedBy', $this->app->user->account) ->setDefault('assignedDate', $now) + ->stripTags($this->config->story->editor->close['id'], $this->config->allowedTags) ->removeIF($this->post->closedReason != 'duplicate', 'duplicateStory') ->removeIF($this->post->closedReason != 'subdivided', 'childStories') ->get(); @@ -1578,6 +1580,7 @@ class storyModel extends model } $this->lang->story->comment = $this->lang->comment; + $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->close['id'], $this->post->uid); $this->dao->update(TABLE_STORY)->data($story, 'comment') ->autoCheck() ->batchCheck($this->config->story->close->requiredFields, 'notempty') @@ -1991,9 +1994,11 @@ class storyModel extends model ->add('lastEditedBy', $this->app->user->account) ->add('lastEditedDate', $now) ->add('assignedDate', $now) + ->stripTags($this->config->story->editor->assignto['id'], $this->config->allowedTags) ->remove('comment') ->get(); + $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->assignto['id'], $this->post->uid); $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->checkFlow()->where('id')->eq((int)$storyID)->exec(); if(!dao::isError()) return common::createChanges($oldStory, $story); return false; @@ -2054,8 +2059,10 @@ class storyModel extends model ->setDefault('lastEditedDate', $now) ->setDefault('assignedDate', $now) ->setDefault('activatedDate', $now) + ->stripTags($this->config->story->editor->activate['id'], $this->config->allowedTags) ->remove('comment') ->get(); + $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->activate['id'], $this->post->uid); $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->checkFlow()->where('id')->eq($storyID)->exec(); if($this->post->status == 'active') $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->exec(); @@ -3908,7 +3915,8 @@ class storyModel extends model $canBeChanged = common::canModify('execution', $execution); if($canBeChanged) { - $param = "executionID={$execution->id}&story={$story->id}&moduleID={$story->module}"; + $executionID = empty($execution) ? $this->session->execution : $execution->id; + $param = "executionID=$executionID&story={$story->id}&moduleID={$story->module}"; $story->reviewer = isset($story->reviewer) ? $story->reviewer : array(); $story->notReview = isset($story->notReview) ? $story->notReview : array(); @@ -3939,7 +3947,7 @@ class storyModel extends model } $this->lang->task->batchCreate = $this->lang->execution->batchWBS; - if($hasDBPriv) $menu .= common::printIcon('task', 'batchCreate', "executionID={$execution->id}&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled); + if($hasDBPriv) $menu .= common::printIcon('task', 'batchCreate', "executionID=$executionID&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled); $this->lang->testcase->batchCreate = $this->lang->testcase->create; if($hasDBPriv and common::hasPriv('testcase', 'create')) @@ -3949,12 +3957,12 @@ class storyModel extends model if($canBeChanged and common::hasPriv('execution', 'storyEstimate', $execution)) { - $menu .= common::printIcon('execution', 'storyEstimate', "executionID=$execution->id&storyID=$story->id", '', 'list', 'estimate', '', 'iframe', true, "data-width='600px'"); + $menu .= common::printIcon('execution', 'storyEstimate', "executionID=$executionID&storyID=$story->id", '', 'list', 'estimate', '', 'iframe', true, "data-width='600px'"); } if($canBeChanged and common::hasPriv('execution', 'unlinkStory', $execution)) { - $menu .= common::printIcon('execution', 'unlinkStory', "executionID=$execution->id&storyID=$story->id&confirm=no", '', 'list', 'unlink', 'hiddenwin'); + $menu .= common::printIcon('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->id&confirm=no", '', 'list', 'unlink', 'hiddenwin'); } } } @@ -4124,11 +4132,12 @@ class storyModel extends model */ public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story', $execution = '', $isShowBranch = '') { - $module = $this->app->rawModule == 'product' ? 'story' : $this->app->rawModule; - $canView = common::hasPriv($module, 'view'); - $tab = $this->app->tab; - $storyLink = $tab == 'execution' ? helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution¶m=$execution->id") : helper::createLink($module, 'view', "storyID=$story->id"); - $account = $this->app->user->account; + $module = $this->app->rawModule == 'product' ? 'story' : $this->app->rawModule; + $canView = common::hasPriv($module, 'view'); + $tab = $this->app->tab; + $executionID = empty($execution) ? $this->session->execution : $execution->id; + $storyLink = $tab == 'execution' ? helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution¶m=$executionID") : helper::createLink($module, 'view', "storyID=$story->id"); + $account = $this->app->user->account; /* Check the product is closed. */ $canBeChanged = common::canBeChanged('story', $story); @@ -4148,8 +4157,9 @@ class storyModel extends model if($tab == 'execution') { $checkObject = new stdclass(); - $checkObject->execution = $execution->id; - $canBatchToTask = common::hasPriv('story', 'batchToTask', $checkObject); + $checkObject->execution = $executionID; + + $canBatchToTask = common::hasPriv('story', 'batchToTask', $checkObject); } if($tab == 'execution') diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php index 6d4b3f5933..18c08dfe88 100644 --- a/module/story/view/activate.html.php +++ b/module/story/view/activate.html.php @@ -3,7 +3,7 @@ * The activate view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: activate.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/story/view/assignto.html.php b/module/story/view/assignto.html.php index a523af0712..8db1b45f73 100644 --- a/module/story/view/assignto.html.php +++ b/module/story/view/assignto.html.php @@ -3,7 +3,7 @@ * The complete file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package story * @version $Id: complete.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index e7594d9013..471f4ae061 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -3,7 +3,7 @@ * The batch close view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package story * @version $Id$ diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 794781efed..94c57d80de 100755 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index b898ae068f..2968aa08a8 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package story * @version $Id$ diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php index 4135f51cc9..8794a78d7a 100644 --- a/module/story/view/change.html.php +++ b/module/story/view/change.html.php @@ -3,7 +3,7 @@ * The change view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: change.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index 38f3a33302..f27d1c9d12 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -3,7 +3,7 @@ * The close view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: close.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index fcda244707..de13873e57 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -3,7 +3,7 @@ * The create view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: create.html.php 4902 2013-06-26 05:25:58Z wyd621@gmail.com $ diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 401800657f..d024d2c274 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: edit.html.php 4645 2013-04-11 08:32:09Z chencongzhi520@gmail.com $ diff --git a/module/story/view/export.html.php b/module/story/view/export.html.php index 2038a7200e..ebe1453b9e 100644 --- a/module/story/view/export.html.php +++ b/module/story/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id$ diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php index 3c9d8effda..62d0ce8431 100644 --- a/module/story/view/linkstory.html.php +++ b/module/story/view/linkstory.html.php @@ -3,7 +3,7 @@ * The link story view of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fei Chen * @package story * @version $Id: linkstory.html.php 4129 2016-03-09 08:58:13Z chenfei $ diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php index 90183db74c..2b663c0aa0 100644 --- a/module/story/view/report.html.php +++ b/module/story/view/report.html.php @@ -3,7 +3,7 @@ * The report view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: report.html.php 1594 2011-03-13 07:27:55Z wwccss $ diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index a32cd350d9..1e1d20a6dc 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -3,7 +3,7 @@ * The view file of review method of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: review.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/story/view/sendmail.html.php b/module/story/view/sendmail.html.php index c29caa7fc7..8189cbd958 100644 --- a/module/story/view/sendmail.html.php +++ b/module/story/view/sendmail.html.php @@ -3,7 +3,7 @@ * The mail file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: sendmail.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 2080c2758a..fa43cce231 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -3,7 +3,7 @@ * The view file of story module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package story * @version $Id: view.html.php 4952 2013-07-02 01:14:58Z chencongzhi520@gmail.com $ diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index 9694f36be8..e9302c0db0 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -3,7 +3,7 @@ * The browse view file of product module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package product * @version $Id: browse.html.php 4909 2013-06-26 07:23:50Z chencongzhi520@gmail.com $ diff --git a/module/svn/control.php b/module/svn/control.php index 0cd0cc92a3..9514eccd65 100644 --- a/module/svn/control.php +++ b/module/svn/control.php @@ -3,7 +3,7 @@ * The control file of svn currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/lang/de.php b/module/svn/lang/de.php index 441b61921a..19030ae575 100644 --- a/module/svn/lang/de.php +++ b/module/svn/lang/de.php @@ -3,7 +3,7 @@ * The svn module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/lang/en.php b/module/svn/lang/en.php index a009cf168e..c558f4dae0 100644 --- a/module/svn/lang/en.php +++ b/module/svn/lang/en.php @@ -3,7 +3,7 @@ * The svn module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/lang/fr.php b/module/svn/lang/fr.php index 33079eedb1..c5db2388fa 100644 --- a/module/svn/lang/fr.php +++ b/module/svn/lang/fr.php @@ -3,7 +3,7 @@ * The svn module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/lang/zh-cn.php b/module/svn/lang/zh-cn.php index 510abc1109..7fc5193d43 100644 --- a/module/svn/lang/zh-cn.php +++ b/module/svn/lang/zh-cn.php @@ -3,7 +3,7 @@ * The svn module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/lang/zh-tw.php b/module/svn/lang/zh-tw.php index 285ed2e212..1cfdae4d34 100644 --- a/module/svn/lang/zh-tw.php +++ b/module/svn/lang/zh-tw.php @@ -3,7 +3,7 @@ * The svn module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/model.php b/module/svn/model.php index 090a3246a7..29363543c8 100644 --- a/module/svn/model.php +++ b/module/svn/model.php @@ -3,7 +3,7 @@ * The model file of svn module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/syncer/syncer.php b/module/svn/syncer/syncer.php index 7ddf35f5d2..6d7ce8e8e3 100644 --- a/module/svn/syncer/syncer.php +++ b/module/svn/syncer/syncer.php @@ -3,7 +3,7 @@ * The syncer of svn. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package svn * @version $Id$ diff --git a/module/svn/view/cat.html.php b/module/svn/view/cat.html.php index 14efa08220..a1180f1613 100644 --- a/module/svn/view/cat.html.php +++ b/module/svn/view/cat.html.php @@ -3,7 +3,7 @@ * The export view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/svn/view/diff.html.php b/module/svn/view/diff.html.php index 90c316bd9c..24083d920c 100644 --- a/module/svn/view/diff.html.php +++ b/module/svn/view/diff.html.php @@ -3,7 +3,7 @@ * The export view file of file module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package file * @version $Id$ diff --git a/module/task/control.php b/module/task/control.php index 515ce21e2d..a2c2441628 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -2,8 +2,8 @@ /** * The control file of task module of ZenTaoPMS. * - * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: control.php 5106 2013-07-12 01:28:54Z chencongzhi520@gmail.com $ diff --git a/module/task/js/create.js b/module/task/js/create.js index 7dfed22038..ec3449172a 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -555,7 +555,7 @@ $('#modalTeam .btn').click(function() } else { - if(config.onlybody == 'yes') + if(config.onlybody == 'yes' && vision == 'lite') { $('.close').parent().click(); } diff --git a/module/task/lang/de.php b/module/task/lang/de.php index b48f5fcfe2..ffd67f7193 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -3,7 +3,7 @@ * The task module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: en.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 981477749e..0e9301092b 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -3,7 +3,7 @@ * The task module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: en.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index acf50cea8a..271036ca87 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -3,7 +3,7 @@ * The task module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: en.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index bf39e02466..88814d0cce 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -3,7 +3,7 @@ * The task module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: zh-cn.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index fd1e4663c8..a54b405789 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -3,7 +3,7 @@ * The task module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: zh-tw.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ diff --git a/module/task/model.php b/module/task/model.php index d268ea4afa..a434100c1d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3,7 +3,7 @@ * The model file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: model.php 5154 2013-07-16 05:51:02Z chencongzhi520@gmail.com $ @@ -113,7 +113,7 @@ class taskModel extends model } } - $task = $this->file->processImgURL($task, $this->config->task->editor->create['id'], $this->post->uid); + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->create['id'], $this->post->uid); /* Fix Bug #1525 */ $executionType = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($executionID)->fetch('type'); @@ -295,7 +295,11 @@ class taskModel extends model if($storyID == 'ditto') $storyID = $preStory; $preStory = $storyID; - if(!isset($tasks->story[$key - 1]) and $key > 1 and !empty($tasks->name[$key - 1])) $taskNames[] = $tasks->name[$key - 1]; + if(!isset($tasks->story[$key - 1]) and $key > 1 and !empty($tasks->name[$key - 1])) + { + $storyIDs[] = 0; + $taskNames[] = $tasks->name[$key - 1]; + } $inNames = in_array($tasks->name[$key], $taskNames); if(!$inNames || ($inNames && !in_array($storyID, $storyIDs))) @@ -1461,6 +1465,7 @@ class taskModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->setDefault('assignedDate', $now) + ->stripTags($this->config->task->editor->assignto['id'], $this->config->allowedTags) ->remove('comment,showModule') ->get(); if($oldTask->status != 'done' and $oldTask->status != 'closed' and isset($task->left) and $task->left == 0) @@ -1485,6 +1490,7 @@ class taskModel extends model if($oldTask->parent > 0) $this->updateParentStatus($taskID); + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->assignto['id'], $this->post->uid); $this->dao->update(TABLE_TASK) ->data($task) ->autoCheck() @@ -1521,6 +1527,8 @@ class taskModel extends model } if(dao::isError()) return false; + $editorIdList = $this->config->task->editor->start['id']; + if($this->app->getMethodName() == 'restart') $editorIdList = $this->config->task->editor->restart['id']; $now = helper::now(); $task = fixer::input('post') ->add('id', $taskID) @@ -1528,9 +1536,11 @@ class taskModel extends model ->setDefault('lastEditedDate', $now) ->setDefault('status', 'doing') ->setIF($oldTask->assignedTo != $this->app->user->account, 'assignedDate', $now) + ->stripTags($editorIdList, $this->config->allowedTags) ->removeIF(!empty($oldTask->team), 'consumed,left') ->remove('comment')->get(); + $task = $this->loadModel('file')->processImgURL($task, $editorIdList, $this->post->uid); if($this->post->left == 0) { if(isset($task->consumed) and $task->consumed == 0) @@ -1759,6 +1769,7 @@ class taskModel extends model ->setDefault('status', 'done') ->setDefault('finishedBy, lastEditedBy', $this->app->user->account) ->setDefault('finishedDate, lastEditedDate', $now) + ->stripTags($this->config->task->editor->finish['id'], $this->config->allowedTags) ->removeIF(!empty($oldTask->team), 'finishedBy,status,left') ->remove('comment,files,labels,currentConsumed') ->get(); @@ -1853,6 +1864,7 @@ class taskModel extends model if($task->finishedDate == substr($now, 0, 10)) $task->finishedDate = $now; + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->finish['id'], $this->post->uid); $this->dao->update(TABLE_TASK)->data($task) ->autoCheck() ->checkFlow() @@ -1892,9 +1904,11 @@ class taskModel extends model ->setDefault('status', 'pause') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) + ->stripTags($this->config->task->editor->pause['id'], $this->config->allowedTags) ->remove('comment') ->get(); + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->pause['id'], $this->post->uid); $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->checkFlow()->where('id')->eq((int)$taskID)->exec(); if($oldTask->parent > 0) $this->updateParentStatus($taskID); @@ -1928,12 +1942,14 @@ class taskModel extends model ->setDefault('assignedDate', $now) ->setDefault('closedBy, lastEditedBy', $this->app->user->account) ->setDefault('closedDate, lastEditedDate', $now) + ->stripTags($this->config->task->editor->close['id'], $this->config->allowedTags) ->setIF($oldTask->status == 'done', 'closedReason', 'done') ->setIF($oldTask->status == 'cancel', 'closedReason', 'cancel') ->remove('_recPerPage') ->remove('comment') ->get(); + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->close['id'], $this->post->uid); $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->checkFlow()->where('id')->eq((int)$taskID)->exec(); if(!dao::isError()) @@ -1976,9 +1992,11 @@ class taskModel extends model ->setDefault('finishedDate', '0000-00-00') ->setDefault('canceledBy, lastEditedBy', $this->app->user->account) ->setDefault('canceledDate, lastEditedDate', $now) + ->stripTags($this->config->task->editor->cancel['id'], $this->config->allowedTags) ->remove('comment') ->get(); + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->cancel['id'], $this->post->uid); $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->checkFlow()->where('id')->eq((int)$taskID)->exec(); if($oldTask->fromBug) $this->dao->update(TABLE_BUG)->set('toTask')->eq(0)->where('id')->eq($oldTask->fromBug)->exec(); if($oldTask->parent > 0) $this->updateParentStatus($taskID); @@ -2040,6 +2058,7 @@ class taskModel extends model ->setDefault('lastEditedDate', helper::now()) ->setDefault('assignedDate', helper::now()) ->setDefault('activatedDate', helper::now()) + ->stripTags($this->config->task->editor->activate['id'], $this->config->allowedTags) ->remove('comment') ->get(); @@ -2060,6 +2079,7 @@ class taskModel extends model $task = $this->computeHours4Multiple($oldTask, $task); } + $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->activate['id'], $this->post->uid); $this->dao->update(TABLE_TASK)->data($task) ->autoCheck() ->batchCheck($this->config->task->activate->requiredFields, 'notempty') diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php index 922d3b23c9..d23301ad33 100644 --- a/module/task/view/activate.html.php +++ b/module/task/view/activate.html.php @@ -3,7 +3,7 @@ * The activate file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: start.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index b58b8e8e65..50f162d9d9 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -3,7 +3,7 @@ * The complete file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: complete.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 60b617f62d..7d2eff9f44 100755 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package task * @version $Id$ diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 348188b2f3..5652cb654a 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package task * @version $Id$ diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php index 4c6ef39043..3cdec6997b 100644 --- a/module/task/view/cancel.html.php +++ b/module/task/view/cancel.html.php @@ -3,7 +3,7 @@ * The cancel file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: cancel.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php index 61795a3205..f9bae7aa8a 100644 --- a/module/task/view/close.html.php +++ b/module/task/view/close.html.php @@ -3,7 +3,7 @@ * The close file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author chunsheng wang * @package task * @version $Id: cancel.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 6c274f41c4..6985557d0f 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -3,7 +3,7 @@ * The create view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: create.html.php 5090 2013-07-10 05:49:24Z zhujinyonging@gmail.com $ @@ -16,6 +16,7 @@ id));?> task->error->teamMember);?> +vision);?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index f2366880e7..e53cafb64d 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: edit.html.php 4897 2013-06-26 01:13:16Z wyd621@gmail.com $ diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php index d0604847ee..fe46b9e3ac 100644 --- a/module/task/view/editestimate.html.php +++ b/module/task/view/editestimate.html.php @@ -3,7 +3,7 @@ * The editEstimate view of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: editestimate.html.php 4263 2013-02-24 08:50:46Z zhujinyonging@gmail.com $ diff --git a/module/task/view/export.html.php b/module/task/view/export.html.php index d14fab7cb8..f541d0a35f 100755 --- a/module/task/view/export.html.php +++ b/module/task/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package task * @version $Id$ diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 47791f0368..0e4085b0f5 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -3,7 +3,7 @@ * The complete file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: complete.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php index 5e221cee4e..79e8979635 100644 --- a/module/task/view/pause.html.php +++ b/module/task/view/pause.html.php @@ -3,7 +3,7 @@ * The pause file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package task * @version $Id$ diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index 27858044a1..cf1e5d976d 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -3,7 +3,7 @@ * The record file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: record.html.php 935 2013-01-08 07:49:24Z wwccss@gmail.com $ diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index 8aa3de6eef..254ddd04cc 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -3,7 +3,7 @@ * The report view file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author wenjie * @package execution * @version $Id: report.html.php 1594 2011-04-10 11:00:00Z wj $ diff --git a/module/task/view/restart.html.php b/module/task/view/restart.html.php index b0701ff44a..94524ebe59 100644 --- a/module/task/view/restart.html.php +++ b/module/task/view/restart.html.php @@ -3,7 +3,7 @@ * The start file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: start.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/sendmail.html.php b/module/task/view/sendmail.html.php index 7bab3c9557..4b12ec0b0d 100644 --- a/module/task/view/sendmail.html.php +++ b/module/task/view/sendmail.html.php @@ -3,7 +3,7 @@ * The mail file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: sendmail.html.php 867 2010-06-17 09:32:58Z yuren_@126.com $ diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 6221cc92d8..b99e88a42b 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -3,7 +3,7 @@ * The start file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Jia Fu * @package task * @version $Id: start.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index fd66f5def7..1c573bf1b3 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -3,7 +3,7 @@ * The view file of task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package task * @version $Id: view.html.php 4808 2013-06-17 05:48:13Z zhujinyonging@gmail.com $ diff --git a/module/testcase/control.php b/module/testcase/control.php index 2f217de6af..e71c12ac8e 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -3,7 +3,7 @@ * The control file of case currentModule of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: control.php 5112 2013-07-12 02:51:33Z chencongzhi520@gmail.com $ diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 20dff21239..d0f83a68a4 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -3,7 +3,7 @@ * The testcase module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testcase * @version $Id: en.php 4966 2013-07-02 02:59:25Z wyd621@gmail.com $ diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index a22a1f8911..5718fc6a10 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -3,7 +3,7 @@ * The testcase module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testcase * @version $Id: en.php 4966 2013-07-02 02:59:25Z wyd621@gmail.com $ diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index a0656ba95e..7645171cc7 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -3,7 +3,7 @@ * The testcase module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testcase * @version $Id: en.php 4966 2013-07-02 02:59:25Z wyd621@gmail.com $ diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 49ee34858f..2f7d5e8c57 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -3,7 +3,7 @@ * The testcase module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testcase * @version $Id: zh-cn.php 4764 2013-05-05 04:07:04Z chencongzhi520@gmail.com $ diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index 789d7f5cb9..b240bdcd39 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -3,7 +3,7 @@ * The testcase module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testcase * @version $Id: zh-tw.php 4764 2013-05-05 04:07:04Z chencongzhi520@gmail.com $ diff --git a/module/testcase/model.php b/module/testcase/model.php index ba07b6894d..bf16af9520 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -3,7 +3,7 @@ * The model file of case module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: model.php 5108 2013-07-12 01:59:04Z chencongzhi520@gmail.com $ @@ -61,6 +61,7 @@ class testcaseModel extends model ->setIF($this->config->systemMode == 'new' and $this->app->tab == 'project', 'project', $this->session->project) ->setIF($this->app->tab == 'execution', 'execution', $this->session->execution) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story)) + ->stripTags($this->config->testcase->editor->create['id'], $this->config->allowedTags) ->remove('steps,expects,files,labels,stepType,forceNotReview') ->setDefault('story', 0) ->cleanInt('story,product,branch,module') @@ -77,6 +78,7 @@ class testcaseModel extends model /* Value of story may be showmore. */ $case->story = (int)$case->story; + $case = $this->loadModel('file')->processImgURL($case, $this->config->testcase->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->create->requiredFields, 'notempty')->checkFlow()->exec(); if(!$this->dao->isError()) { @@ -607,7 +609,7 @@ class testcaseModel extends model */ public function getByAssignedTo($account, $orderBy = 'id_desc', $pager = null, $auto = 'no') { - return $this->dao->select('t1.*,t2.project,t2.pri,t2.title,t2.type,t2.openedBy,t2.color,t2.product,t2.branch,t2.module,t2.status,t3.name as taskName')->from(TABLE_TESTRUN)->alias('t1') + return $this->dao->select('t1.task,t1.case,t1.version,t1.assignedTo,t1.lastRunner,t1.lastRunDate,t1.lastRunResult,t1.status,t2.id as id,t2.project,t2.pri,t2.title,t2.type,t2.openedBy,t2.color,t2.product,t2.branch,t2.module,t2.status,t3.name as taskName')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_TESTTASK)->alias('t3')->on('t1.task = t3.id') ->where('t1.assignedTo')->eq($account) @@ -768,6 +770,7 @@ class testcaseModel extends model ->join('linkCase', ',') ->setForce('status', $status) ->cleanInt('story,product,branch,module') + ->stripTags($this->config->testcase->editor->edit['id'], $this->config->allowedTags) ->remove('comment,steps,expects,files,labels,stepType') ->get(); @@ -780,6 +783,7 @@ class testcaseModel extends model array_splice($requiredFieldsArr, $fieldIndex, 1); $requiredFields = implode(',', $requiredFieldsArr); } + $case = $this->loadModel('file')->processImgURL($case, $this->config->testcase->editor->edit['id'], $this->post->uid); $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($requiredFields, 'notempty')->checkFlow()->where('id')->eq((int)$caseID)->exec(); if(!$this->dao->isError()) { @@ -883,10 +887,12 @@ class testcaseModel extends model ->setDefault('reviewedDate', substr($now, 0, 10)) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) + ->stripTags($this->config->testcase->editor->review['id'], $this->config->allowedTags) ->setForce('status', $status) ->join('reviewedBy', ',') ->get(); + $case = $this->loadModel('file')->processImgURL($case, $this->config->testcase->editor->review['id'], $this->post->uid); $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->checkFlow()->where('id')->eq($caseID)->exec(); if(dao::isError()) return false; @@ -1268,11 +1274,26 @@ class testcaseModel extends model ->fetchGroup('case'); $oldCases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($_POST['id'])->fetchAll('id'); } + + $cases = array(); + $line = 1; + $fieldNames = array(); $storyVersionPairs = $this->story->getVersions($data->story); - $cases = array(); - $line = 1; - $fieldNames = array(); + if($this->config->edition != 'open') + { + $extendFields = $this->getFlowExtendFields(); + $notEmptyRule = $this->loadModel('workflowrule')->getByTypeAndRule('system', 'notempty'); + + foreach($extendFields as $extendField) + { + if(strpos(",$extendField->rules,", ",$notEmptyRule->id,") !== false) + { + $this->config->testcase->create->requiredFields .= ',' . $extendField->field; + } + } + } + foreach($data->product as $key => $product) { $caseData = new stdclass(); @@ -1289,6 +1310,18 @@ class testcaseModel extends model $caseData->frequency = 1; $caseData->precondition = $data->precondition[$key]; + if($this->config->edition != 'open') + { + foreach($extendFields as $extendField) + { + $dataArray = $_POST[$extendField->field]; + $caseData->{$extendField->field} = $dataArray[$key]; + if(is_array($caseData->{$extendField->field})) $caseData->{$extendField->field} = join(',', $caseData->{$extendField->field}); + + $caseData->{$extendField->field} = htmlSpecialString($caseData->{$extendField->field}); + } + } + if(isset($this->config->testcase->create->requiredFields)) { $requiredFields = explode(',', $this->config->testcase->create->requiredFields); @@ -1300,16 +1333,6 @@ class testcaseModel extends model } } - if(isset($this->config->testcase->appendFields)) - { - foreach(explode(',', $this->config->testcase->appendFields) as $appendField) - { - if(empty($appendField)) continue; - $caseData->$appendField = zget($_POST[$appendField], $key, ''); - if(is_array($caseData->$appendField)) $caseData->$appendField = join(',', $caseData->$appendField); - } - } - $cases[$key] = $caseData; $line++; } @@ -1382,34 +1405,38 @@ class testcaseModel extends model $caseData->lastEditedBy = $this->app->user->account; $caseData->lastEditedDate = $now; if($stepChanged and !$forceNotReview) $caseData->status = 'wait'; - $this->dao->update(TABLE_CASE)->data($caseData)->where('id')->eq($caseID)->autoCheck()->exec(); - if($stepChanged) + $this->dao->update(TABLE_CASE)->data($caseData)->where('id')->eq($caseID)->autoCheck()->checkFlow()->exec(); + + if(!dao::isError()) { - $parentStepID = 0; - foreach($steps as $id => $step) + if($stepChanged) { - $step = (array)$step; - if(empty($step['desc'])) continue; - $stepData = new stdclass(); - $stepData->type = ($step['type'] == 'item' and $parentStepID == 0) ? 'step' : $step['type']; - $stepData->parent = ($stepData->type == 'item') ? $parentStepID : 0; - $stepData->case = $caseID; - $stepData->version = $version; - $stepData->desc = $step['desc']; - $stepData->expect = $step['expect']; - $this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec(); - if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID(); - if($stepData->type == 'step') $parentStepID = 0; + $parentStepID = 0; + foreach($steps as $id => $step) + { + $step = (array)$step; + if(empty($step['desc'])) continue; + $stepData = new stdclass(); + $stepData->type = ($step['type'] == 'item' and $parentStepID == 0) ? 'step' : $step['type']; + $stepData->parent = ($stepData->type == 'item') ? $parentStepID : 0; + $stepData->case = $caseID; + $stepData->version = $version; + $stepData->desc = $step['desc']; + $stepData->expect = $step['expect']; + $this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec(); + if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID(); + if($stepData->type == 'step') $parentStepID = 0; + } } + $oldCase->steps = $this->joinStep($oldStep); + $caseData->steps = $this->joinStep($steps); + $changes = common::createChanges($oldCase, $caseData); + + $this->updateCase2Project($oldCase, $caseData, $caseID); + + $actionID = $this->action->create('case', $caseID, 'Edited'); + $this->action->logHistory($actionID, $changes); } - $oldCase->steps = $this->joinStep($oldStep); - $caseData->steps = $this->joinStep($steps); - $changes = common::createChanges($oldCase, $caseData); - - $this->updateCase2Project($oldCase, $caseData, $caseID); - - $actionID = $this->action->create('case', $caseID, 'Edited'); - $this->action->logHistory($actionID, $changes); } } else @@ -1421,7 +1448,7 @@ class testcaseModel extends model $caseData->branch = isset($data->branch[$key]) ? $data->branch[$key] : $branch; if($caseData->story) $caseData->storyVersion = zget($storyVersionPairs, $caseData->story, 1); $caseData->status = !$forceNotReview ? 'wait' : 'normal'; - $this->dao->insert(TABLE_CASE)->data($caseData)->autoCheck()->exec(); + $this->dao->insert(TABLE_CASE)->data($caseData)->autoCheck()->checkFlow()->exec(); if(!dao::isError()) { @@ -2123,7 +2150,13 @@ class testcaseModel extends model if(!$case->needconfirm) { - if(!isonlybody()) $menu .= $this->buildMenu('testcase', 'edit', $params, $case, 'view', '', '', 'showinonlybody'); + if(!isonlybody()) + { + $editParams = $params; + if($this->app->tab == 'project') $editParams .= "&comment=false&projectID={$this->session->project}"; + if($this->app->tab == 'execution') $editParams .= "&comment=false&executionID={$this->session->execution}"; + $menu .= $this->buildMenu('testcase', 'edit', $editParams, $case, 'view', '', '', 'showinonlybody'); + } if(!$case->isLibCase && $case->auto != 'unit') { $menu .= $this->buildMenu('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'view', 'copy'); @@ -2161,7 +2194,12 @@ class testcaseModel extends model $menu .= $this->buildMenu('testtask', 'results', "runID=0&$params", $case, 'browse', '', '', 'iframe', true, "data-width='95%'"); $menu .= $this->buildMenu('testtask', 'runCase', "runID=0&$params&version=$case->version", $case, 'browse', 'play', '', 'runCase iframe', false, "data-width='95%'"); - $menu .= $this->buildMenu('testcase', 'edit', "caseID=$case->id", $case, 'browse'); + + $editParams = $params; + if($this->app->tab == 'project') $editParams .= "&comment=false&projectID={$this->session->project}"; + if($this->app->tab == 'execution') $editParams .= "&comment=false&executionID={$this->session->execution}"; + $menu .= $this->buildMenu('testcase', 'edit', $editParams, $case, 'browse'); + if($this->config->testcase->needReview || !empty($this->config->testcase->forceReview)) { common::printIcon('testcase', 'review', $params, $case, 'browse', 'glasses', '', 'iframe'); diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 804a882dd7..0584fdb584 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package testcase * @version $Id$ diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index e4ab1fabde..d2427ba8a4 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit view of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package testcase * @version $Id$ diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 5d37e3bb13..ce200ab723 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testcase * @version $Id: browse.html.php 5108 2013-07-12 01:59:04Z chencongzhi520@gmail.com $ diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 3494299c20..54433855c8 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -3,7 +3,7 @@ * The create view of case module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: create.html.php 4904 2013-06-26 05:37:45Z wyd621@gmail.com $ diff --git a/module/testcase/view/createbug.html.php b/module/testcase/view/createbug.html.php index 356b82169c..0e37528519 100644 --- a/module/testcase/view/createbug.html.php +++ b/module/testcase/view/createbug.html.php @@ -3,7 +3,7 @@ * The createByg view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testcase * @version $Id$ diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 4ff3e7e53e..ac4c3c13e6 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -3,7 +3,7 @@ * The edit file of case module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: edit.html.php 5000 2013-07-03 08:20:57Z chencongzhi520@gmail.com $ diff --git a/module/testcase/view/export.html.php b/module/testcase/view/export.html.php index 810835117b..32b5f8cddc 100644 --- a/module/testcase/view/export.html.php +++ b/module/testcase/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package testcase * @version $Id$ diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index e0f3adfddb..31df290fa7 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -3,7 +3,7 @@ * The case group view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testcase * @version $Id$ diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php index 374871dfba..f25864f2ab 100644 --- a/module/testcase/view/importfromlib.html.php +++ b/module/testcase/view/importfromlib.html.php @@ -3,7 +3,7 @@ * The importfromlib view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testcase * @version $Id diff --git a/module/testcase/view/index.html.php b/module/testcase/view/index.html.php index 2b4994194a..1deb6bf36a 100644 --- a/module/testcase/view/index.html.php +++ b/module/testcase/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php index ab5e4db49f..b358c8502f 100644 --- a/module/testcase/view/linkcases.html.php +++ b/module/testcase/view/linkcases.html.php @@ -3,7 +3,7 @@ * The linkcases view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Fei Chen * @package testcase * @version $Id: linkcases.html.php 4411 2016-03-09 11:02:04Z Chen Fei $ diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php index 9b2c19169c..501bf72314 100644 --- a/module/testcase/view/review.html.php +++ b/module/testcase/view/review.html.php @@ -3,7 +3,7 @@ * The view file of review method of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testcase * @version $Id: review.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index 0a66864f54..44d00ea281 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -45,11 +45,19 @@ $(function() '>testcase->stage?> '>testcase->precondition?> '>testcase->keywords?>testcase->{$appendField->field}?>$field->name @@ -106,12 +114,18 @@ $(function() - - loadModel('flow');?> - - - - + loadModel('flow'); + foreach($appendFields as $field) + { + if(!$field->show) continue; + $value = $field->defaultValue ? $field->defaultValue : zget($case, $field->field, ''); + echo ''; + } + } + ?>
testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?> precondition) ? htmlSpecialString($case->precondition) : "", "class='form-control'")?> keywords) ? $case->keywords : '', "class='form-control'")?>flow->buildControl($appendField, zget($case, $appendField->field, ''), "{$appendField->field}[$key]");?>' . $this->flow->buildControl($field, $value, "$field->field[$key]", true) . ' diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index afd9e223d8..708023fcd6 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -3,7 +3,7 @@ * The view file of case module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: view.html.php 5000 2013-07-03 08:20:57Z chencongzhi520@gmail.com $ diff --git a/module/testreport/control.php b/module/testreport/control.php index 57e7b88168..033ff87ffd 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -3,7 +3,7 @@ * The control file of testreport of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testreport * @version $Id$ diff --git a/module/testreport/model.php b/module/testreport/model.php index 300a932aaa..22be9f82aa 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -3,7 +3,7 @@ * The model file of testreport module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testreport * @version $Id$ diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php index 845142d9fd..20a1221384 100644 --- a/module/testreport/view/browse.html.php +++ b/module/testreport/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of testreport module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testreport * @version $Id$ diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php index 353affdd93..feb1b2ddd7 100644 --- a/module/testreport/view/create.html.php +++ b/module/testreport/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of testreport module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testreport * @version $Id$ diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php index 9081388c71..0060819f2e 100644 --- a/module/testreport/view/edit.html.php +++ b/module/testreport/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of testreport module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testreport * @version $Id$ diff --git a/module/testreport/view/selecttask.html.php b/module/testreport/view/selecttask.html.php index a9a41090c8..0132267874 100644 --- a/module/testreport/view/selecttask.html.php +++ b/module/testreport/view/selecttask.html.php @@ -3,7 +3,7 @@ * The select task file of testreport module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package testreport * @version $Id: resolve.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php index 13d198d6d3..30e03ba55d 100644 --- a/module/testreport/view/view.html.php +++ b/module/testreport/view/view.html.php @@ -3,7 +3,7 @@ * The view view file of testreport module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testreport * @version $Id$ diff --git a/module/testsuite/control.php b/module/testsuite/control.php index d27e771410..ce81242869 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -3,7 +3,7 @@ * The control file of testsuite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testsuite * @version $Id: control.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $ diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php index 6982ff58b4..62c11e07dc 100644 --- a/module/testsuite/lang/de.php +++ b/module/testsuite/lang/de.php @@ -3,7 +3,7 @@ * The testsuite module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testsuite * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index 3171bf426d..013fe21932 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -3,7 +3,7 @@ * The testsuite module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testsuite * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php index fed630f012..1465ea44b6 100644 --- a/module/testsuite/lang/fr.php +++ b/module/testsuite/lang/fr.php @@ -3,7 +3,7 @@ * The testsuite module en file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testsuite * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php index 349fe18e86..114a225bcc 100644 --- a/module/testsuite/lang/zh-cn.php +++ b/module/testsuite/lang/zh-cn.php @@ -3,7 +3,7 @@ * The testsuite module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testsuite * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testsuite/lang/zh-tw.php b/module/testsuite/lang/zh-tw.php index 2ce0b38183..f8e3006a1a 100644 --- a/module/testsuite/lang/zh-tw.php +++ b/module/testsuite/lang/zh-tw.php @@ -3,7 +3,7 @@ * The testsuite module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testsuite * @version $Id: zh-tw.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testsuite/model.php b/module/testsuite/model.php index d3d60f92aa..665f290c84 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -3,7 +3,7 @@ * The model file of test suite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testsuite * @version $Id: model.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $ diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php index 6503d4d34a..b6d0ffc989 100644 --- a/module/testsuite/view/browse.html.php +++ b/module/testsuite/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of testsuite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testsuite * @version $Id: browse.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testsuite/view/create.html.php b/module/testsuite/view/create.html.php index b4ca902e85..b1c17243d7 100644 --- a/module/testsuite/view/create.html.php +++ b/module/testsuite/view/create.html.php @@ -3,7 +3,7 @@ * The create view of testsuite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testsuite * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/testsuite/view/edit.html.php b/module/testsuite/view/edit.html.php index 6b826c3510..680776813d 100644 --- a/module/testsuite/view/edit.html.php +++ b/module/testsuite/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of testsuite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testsuite * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php index 67dced905a..b54bd41574 100644 --- a/module/testsuite/view/linkcase.html.php +++ b/module/testsuite/view/linkcase.html.php @@ -3,7 +3,7 @@ * The linkcase view file of testsuite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testsuite * @version $Id: linkcase.html.php 4411 2013-02-22 00:56:04Z chencongzhi520@gmail.com $ diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php index efdb7d4a9f..bf0c2557eb 100644 --- a/module/testsuite/view/view.html.php +++ b/module/testsuite/view/view.html.php @@ -3,7 +3,7 @@ * The view file of testsuite module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testsuite * @version $Id: view.html.php 4141 2013-01-18 06:15:13Z zhujinyonging@gmail.com $ diff --git a/module/testtask/control.php b/module/testtask/control.php index 9d9affa53b..72e9b616be 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -3,7 +3,7 @@ * The control file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: control.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $ diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index 9f25dddd63..87f60e58b6 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -3,7 +3,7 @@ * The testtask module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: en.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 35343d0cbf..4280bd9766 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -3,7 +3,7 @@ * The testtask module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: en.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php index e3953766cf..ea04ea3287 100644 --- a/module/testtask/lang/fr.php +++ b/module/testtask/lang/fr.php @@ -3,7 +3,7 @@ * The testtask module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: en.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index f1c0cf09bd..df9ed6df5f 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -3,7 +3,7 @@ * The testtask module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php index c96e2df1be..5d037e7649 100644 --- a/module/testtask/lang/zh-tw.php +++ b/module/testtask/lang/zh-tw.php @@ -3,7 +3,7 @@ * The testtask module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: zh-tw.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ diff --git a/module/testtask/model.php b/module/testtask/model.php index 9c8720028c..b5930503f2 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -3,7 +3,7 @@ * The model file of test task module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: model.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $ @@ -772,8 +772,10 @@ class testtaskModel extends model $testtask = fixer::input('post') ->add('id', $taskID) ->setDefault('status', 'doing') + ->stripTags($this->config->testtask->editor->start['id'], $this->config->allowedTags) ->remove('comment')->get(); + $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->start['id'], $this->post->uid); $this->dao->update(TABLE_TESTTASK)->data($testtask) ->autoCheck() ->checkFlow() @@ -838,8 +840,10 @@ class testtaskModel extends model $testtask = fixer::input('post') ->add('id', $taskID) ->setDefault('status', 'blocked') + ->stripTags($this->config->testtask->editor->block['id'], $this->config->allowedTags) ->remove('comment')->get(); + $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->block['id'], $this->post->uid); $this->dao->update(TABLE_TESTTASK)->data($testtask) ->autoCheck() ->checkFlow() @@ -861,8 +865,10 @@ class testtaskModel extends model $oldTesttask = $this->getById($taskID); $testtask = fixer::input('post') ->setDefault('status', 'doing') + ->stripTags($this->config->testtask->editor->activate['id'], $this->config->allowedTags) ->remove('comment')->get(); + $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->activate['id'], $this->post->uid); $this->dao->update(TABLE_TESTTASK)->data($testtask) ->autoCheck() ->checkFlow() diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php index 68f38ff3cf..1cde8985f7 100644 --- a/module/testtask/view/activate.html.php +++ b/module/testtask/view/activate.html.php @@ -3,7 +3,7 @@ * The start file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: start.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index 13dab61fc0..48eed57c00 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -3,7 +3,7 @@ * The batch edit view of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package testcase * @version $Id$ diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php index 9d8d88385b..27d8539071 100644 --- a/module/testtask/view/block.html.php +++ b/module/testtask/view/block.html.php @@ -3,7 +3,7 @@ * The start file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: start.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index fbd46f6bb1..44475d4a9a 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: browse.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php index 62f0279fdd..cfc0c25e29 100644 --- a/module/testtask/view/browseunits.html.php +++ b/module/testtask/view/browseunits.html.php @@ -3,7 +3,7 @@ * The browse view file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: browse.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index e821bce3c3..54ba52db0b 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -3,7 +3,7 @@ * The view file of case module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: view.html.php 594 2010-03-27 13:44:07Z wwccss $ diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php index 7c3cdb886c..8c8f576f17 100644 --- a/module/testtask/view/close.html.php +++ b/module/testtask/view/close.html.php @@ -3,7 +3,7 @@ * The close file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: close.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index 38ff5fcd55..36a92833b3 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -3,7 +3,7 @@ * The create view of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index 57a3b6487d..bb8b50d399 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php index 852b74292a..45dbf4a280 100644 --- a/module/testtask/view/groupcase.html.php +++ b/module/testtask/view/groupcase.html.php @@ -3,7 +3,7 @@ * The case group view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testcase * @version $Id$ diff --git a/module/testtask/view/importunitresult.html.php b/module/testtask/view/importunitresult.html.php index 73ded709a6..fe089949a9 100644 --- a/module/testtask/view/importunitresult.html.php +++ b/module/testtask/view/importunitresult.html.php @@ -3,7 +3,7 @@ * The create view of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 727c6568fa..07ad73eac5 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -3,7 +3,7 @@ * The linkcase view file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: linkcase.html.php 4411 2013-02-22 00:56:04Z chencongzhi520@gmail.com $ diff --git a/module/testtask/view/report.html.php b/module/testtask/view/report.html.php index 2a8ca5c66b..9b65cfc1dd 100644 --- a/module/testtask/view/report.html.php +++ b/module/testtask/view/report.html.php @@ -3,7 +3,7 @@ * The report view file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: report.html.php 4657 2013-04-17 02:01:26Z chencongzhi520@gmail.com $ diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index e20e688ea6..37e3905a72 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -3,7 +3,7 @@ * The resutls view file of testtask of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: results.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php index 8626c51821..e031353d10 100644 --- a/module/testtask/view/runcase.html.php +++ b/module/testtask/view/runcase.html.php @@ -3,7 +3,7 @@ * The runrun view file of testtask of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: runcase.html.php 4723 2013-05-03 05:19:29Z chencongzhi520@gmail.com $ diff --git a/module/testtask/view/sendmail.html.php b/module/testtask/view/sendmail.html.php index 11c88e80e5..1494b85194 100644 --- a/module/testtask/view/sendmail.html.php +++ b/module/testtask/view/sendmail.html.php @@ -3,7 +3,7 @@ * The mail file of testtesttask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package bug * @version $Id: sendmail.html.php 3717 2012-12-10 00:37:07Z zhujinyonging@gmail.com $ diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php index fe9cf19be8..0353b2ffd2 100644 --- a/module/testtask/view/start.html.php +++ b/module/testtask/view/start.html.php @@ -3,7 +3,7 @@ * The start file of testtask module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package testtask * @version $Id: start.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ diff --git a/module/testtask/view/unitcases.html.php b/module/testtask/view/unitcases.html.php index 795f4c2e68..fb162beb93 100644 --- a/module/testtask/view/unitcases.html.php +++ b/module/testtask/view/unitcases.html.php @@ -3,7 +3,7 @@ * The unit view file of testcase module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package testcase * @version $Id$ diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index 7bb7fa2871..81ab97e7c1 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -3,7 +3,7 @@ * The view file of case module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package case * @version $Id: view.html.php 4141 2013-01-18 06:15:13Z zhujinyonging@gmail.com $ diff --git a/module/todo/control.php b/module/todo/control.php index 4705e05c8b..f682d3c489 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -3,7 +3,7 @@ * The control file of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: control.php 4976 2013-07-02 08:15:31Z wyd621@gmail.com $ diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php index 4fc9836de8..c4801654d2 100644 --- a/module/todo/lang/de.php +++ b/module/todo/lang/de.php @@ -3,7 +3,7 @@ * The todo module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index c3a58f7db6..202b62452d 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -3,7 +3,7 @@ * The todo module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php index 9154e1d034..ac5907f6d4 100644 --- a/module/todo/lang/fr.php +++ b/module/todo/lang/fr.php @@ -3,7 +3,7 @@ * The todo module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 5fb2578c24..e5e11b9b0d 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -3,7 +3,7 @@ * The todo module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: zh-cn.php 5022 2013-07-05 06:50:39Z chencongzhi520@gmail.com $ diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php index ca4777a325..cef237c46f 100644 --- a/module/todo/lang/zh-tw.php +++ b/module/todo/lang/zh-tw.php @@ -3,7 +3,7 @@ * The todo module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: zh-tw.php 5022 2013-07-05 06:50:39Z chencongzhi520@gmail.com $ diff --git a/module/todo/model.php b/module/todo/model.php index d3a569fac3..c60d101c53 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -3,7 +3,7 @@ * The model file of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: model.php 5035 2013-07-06 05:21:58Z wyd621@gmail.com $ diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php index 3f670d6813..83f9cf9435 100755 --- a/module/todo/view/assignto.html.php +++ b/module/todo/view/assignto.html.php @@ -3,7 +3,7 @@ * The batch create view of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package todo * @version $Id: create.html.php 2741 2012-04-07 07:24:21 $ diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index 6a16e94fb3..80399c61f9 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package todo * @version $Id: create.html.php 2741 2012-04-07 07:24:21Z areyou123456 $ diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php index bcd65fdc2f..30319c9edb 100644 --- a/module/todo/view/batchedit.html.php +++ b/module/todo/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch edit view of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package todo * @version $Id: create.html.php 2741 2012-04-07 07:24:21Z areyou123456 $ diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php index b565b6bdb1..b787b40cd5 100644 --- a/module/todo/view/create.html.php +++ b/module/todo/view/create.html.php @@ -3,7 +3,7 @@ * The create view of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index ab453962dd..be41727f21 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -3,7 +3,7 @@ * The create view of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/todo/view/export.html.php b/module/todo/view/export.html.php index 19848d152e..ed4ce1de45 100755 --- a/module/todo/view/export.html.php +++ b/module/todo/view/export.html.php @@ -3,7 +3,7 @@ * The export view file of bug module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package todo * @version $Id$ diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 2fcf9715a0..74d6226350 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -3,7 +3,7 @@ * The view file of view method of todo module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package todo * @version $Id: view.html.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $ diff --git a/module/tree/control.php b/module/tree/control.php index 6ba17a19fe..b88676aeef 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -4,7 +4,7 @@ * The control file of tree module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: control.php 5002 2013-07-03 08:25:39Z chencongzhi520@gmail.com $ @@ -229,6 +229,49 @@ class tree extends control $title = $this->lang->tree->manageTrainpost; $position[] = $this->lang->tree->manageTrainpost; } + elseif(strpos($viewType, 'datasource') !== false) + { + $params = explode('_', $viewType); + if(count($params) == 2) + { + $datasourceID = $params[1]; + $manageChild = 'manage' . ucfirst($viewType) . 'Child'; + $datasource = $this->loadModel('workflowdatasource', 'flow')->getByID($datasourceID); + if($datasource) + { + $this->app->rawModule = 'workflowdatasource'; + + $title = $datasource->name; + $position[] = $datasource->name; + + $this->lang->tree->$manageChild = $title; + + $root = new stdclass(); + $root->name = $title; + $this->view->root = $root; + } + } + } + /* viewType is workflow building category. */ + else if(strpos($viewType, '_') !== false) + { + $params = explode('_', $viewType); + if(count($params) == 2) + { + $this->app->rawModule = $params[0]; + + $manageChild = 'manage' . ucfirst($viewType) . 'Child'; + + $title = $this->lang->tree->common; + $position[] = $this->lang->tree->common; + + $this->lang->tree->$manageChild = $title; + + $root = new stdclass(); + $root->name = $title; + $this->view->root = $root; + } + } $parentModules = $this->tree->getParents($currentModuleID); $this->view->title = $title; diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 87be35fac9..388bdfdb05 100644 --- a/module/tree/lang/de.php +++ b/module/tree/lang/de.php @@ -3,7 +3,7 @@ * The tree module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: en.php 5045 2013-07-06 07:04:40Z zhujinyonging@gmail.com $ diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 9fb6632a2e..4c4af17327 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -3,7 +3,7 @@ * The tree module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: en.php 5045 2013-07-06 07:04:40Z zhujinyonging@gmail.com $ diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index 327ac0fb43..8800abe988 100644 --- a/module/tree/lang/fr.php +++ b/module/tree/lang/fr.php @@ -3,7 +3,7 @@ * The tree module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: en.php 5045 2013-07-06 07:04:40Z zhujinyonging@gmail.com $ diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 5d6c89c0f1..da538582ae 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -3,7 +3,7 @@ * The tree module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: zh-cn.php 4836 2013-06-19 05:39:40Z zhujinyonging@gmail.com $ diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 8c507dfed0..eca9f888a1 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -3,7 +3,7 @@ * The tree module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: zh-tw.php 4836 2013-06-19 05:39:40Z zhujinyonging@gmail.com $ diff --git a/module/tree/model.php b/module/tree/model.php index e9f0eb6be8..684b58142f 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -3,7 +3,7 @@ * The model file of tree module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: model.php 5149 2013-07-16 01:47:01Z zhujinyonging@gmail.com $ diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 71b8687341..3ba7dbf218 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of tree module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: browse.html.php 4796 2013-06-06 02:21:59Z zhujinyonging@gmail.com $ diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index 6a4b0a33dd..5efb143d3f 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -3,7 +3,7 @@ * The browse view file of tree module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: browse.html.php 4796 2013-06-06 02:21:59Z zhujinyonging@gmail.com $ diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index e4018a81ca..92bafdd876 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of tree module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package tree * @version $Id: edit.html.php 4795 2013-06-04 05:59:58Z zhujinyonging@gmail.com $ diff --git a/module/tutorial/control.php b/module/tutorial/control.php index 5ec68c3d0c..a8d44dc424 100644 --- a/module/tutorial/control.php +++ b/module/tutorial/control.php @@ -3,7 +3,7 @@ * The control file of tutorial module of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package tutorial * @version $Id: control.php 5002 2013-07-03 08:25:39Z chencongzhi520@gmail.com $ diff --git a/module/tutorial/lang/de.php b/module/tutorial/lang/de.php index a487c5f52f..cceb6e977b 100644 --- a/module/tutorial/lang/de.php +++ b/module/tutorial/lang/de.php @@ -3,7 +3,7 @@ * The tutorial lang file of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 18742840c3..4b94da5844 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -3,7 +3,7 @@ * The tutorial lang file of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ diff --git a/module/tutorial/lang/fr.php b/module/tutorial/lang/fr.php index a3e4cb4648..cdcb79bc13 100644 --- a/module/tutorial/lang/fr.php +++ b/module/tutorial/lang/fr.php @@ -3,7 +3,7 @@ * The tutorial lang file of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index a698817db8..520f0ae701 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -3,7 +3,7 @@ * The tutorial lang file of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php index e926425113..fbac50b89d 100644 --- a/module/tutorial/lang/zh-tw.php +++ b/module/tutorial/lang/zh-tw.php @@ -3,7 +3,7 @@ * The tutorial lang file of ZenTaoPMS. * * @copyright Copyright 2009-2016 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package ZenTaoPMS * @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 004fc8feeb..604148087a 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -3,7 +3,7 @@ * The model file of tutorial module of ZenTaoCMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package tutorial * @version $Id$ diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index f0136f8685..72096df2a7 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -3,7 +3,7 @@ * The index view file of tutorial module of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package tutorial * @version $Id: browse.html.php 4728 2013-05-03 06:14:34Z sunhao@cnezsoft.com $ diff --git a/module/tutorial/view/start.html.php b/module/tutorial/view/start.html.php index e8a9463f2e..d9b9134fcf 100644 --- a/module/tutorial/view/start.html.php +++ b/module/tutorial/view/start.html.php @@ -3,7 +3,7 @@ * The start view file of tutorial module of ZenTaoPMS. * * @copyright Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Hao Sun * @package tutorial * @version $Id: browse.html.php 4728 2013-05-03 06:14:34Z sunhao@cnezsoft.com $ diff --git a/module/upgrade/control.php b/module/upgrade/control.php index ae4b2b9de1..754f9fd4b9 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -3,7 +3,7 @@ * The control file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: control.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index 57782dd881..c8c9d51cee 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -3,7 +3,7 @@ * The upgrade module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index e9fe9f80ea..7af24cb5e4 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -3,7 +3,7 @@ * The upgrade module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index 9a7c497b65..6be4ca1121 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -3,7 +3,7 @@ * The upgrade module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index e88539e414..8b349e08e7 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -3,7 +3,7 @@ * The upgrade module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: zh-cn.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 3d176575c8..4ea7fedbd6 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -3,7 +3,7 @@ * The upgrade module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: zh-tw.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 04df92eac1..574ea6d48a 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3,7 +3,7 @@ * The model file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: model.php 5019 2013-07-05 02:02:31Z wyd621@gmail.com $ @@ -943,7 +943,8 @@ class upgradeModel extends model case '16_5_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('16.5.beta1')); case '16_5': $confirmContent .= file_get_contents($this->getUpgradeFile('16.5')); case '17_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0.beta1')); - case '17_0_beta2': + case '17_0_beta2': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0.beta2')); + case '17_0': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0')); } return $confirmContent; diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php index 9d45361424..d1c2433b2e 100644 --- a/module/upgrade/view/afterexec.html.php +++ b/module/upgrade/view/afterexec.html.php @@ -3,7 +3,7 @@ * The html template file of execute method of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: execute.html.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/view/backup.html.php b/module/upgrade/view/backup.html.php index 7cb039e165..fc63d73623 100644 --- a/module/upgrade/view/backup.html.php +++ b/module/upgrade/view/backup.html.php @@ -3,7 +3,7 @@ * The html template file of index method of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/upgrade/view/checkextension.html.php b/module/upgrade/view/checkextension.html.php index 7236fa23ed..3ea094fe17 100644 --- a/module/upgrade/view/checkextension.html.php +++ b/module/upgrade/view/checkextension.html.php @@ -3,7 +3,7 @@ * The checkExtension view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id$ diff --git a/module/upgrade/view/confirm.html.php b/module/upgrade/view/confirm.html.php index cbbd696363..bdbaf1ebd0 100644 --- a/module/upgrade/view/confirm.html.php +++ b/module/upgrade/view/confirm.html.php @@ -3,7 +3,7 @@ * The html template file of confirm method of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: confirm.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/upgrade/view/consistency.html.php b/module/upgrade/view/consistency.html.php index 9cd1b43527..d2015d12e2 100644 --- a/module/upgrade/view/consistency.html.php +++ b/module/upgrade/view/consistency.html.php @@ -3,7 +3,7 @@ * The checkExtension view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id$ diff --git a/module/upgrade/view/execute.html.php b/module/upgrade/view/execute.html.php index 629c9b6de4..d7f6bc3e0e 100644 --- a/module/upgrade/view/execute.html.php +++ b/module/upgrade/view/execute.html.php @@ -3,7 +3,7 @@ * The html template file of execute method of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: execute.html.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ diff --git a/module/upgrade/view/license.html.php b/module/upgrade/view/license.html.php index d6927f692d..2b2408aa05 100644 --- a/module/upgrade/view/license.html.php +++ b/module/upgrade/view/license.html.php @@ -3,7 +3,7 @@ * The html file of license method of upgrade module of ZentaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id: selectversion.html.php 1292 2014-06-05 03:03:52Z guanxiying $ diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php index 3e982def50..341a1b14bf 100644 --- a/module/upgrade/view/mergeprogram.html.php +++ b/module/upgrade/view/mergeprogram.html.php @@ -3,7 +3,7 @@ * The mergeProgram view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id$ diff --git a/module/upgrade/view/mergerepo.html.php b/module/upgrade/view/mergerepo.html.php index 6d97b18d0a..463729c431 100644 --- a/module/upgrade/view/mergerepo.html.php +++ b/module/upgrade/view/mergerepo.html.php @@ -3,7 +3,7 @@ * The mergerepo view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id$ diff --git a/module/upgrade/view/mergetips.html.php b/module/upgrade/view/mergetips.html.php index ccbfcd7e8f..bc6820fdfe 100644 --- a/module/upgrade/view/mergetips.html.php +++ b/module/upgrade/view/mergetips.html.php @@ -3,7 +3,7 @@ * The to20 view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id$ diff --git a/module/upgrade/view/moveextfiles.html.php b/module/upgrade/view/moveextfiles.html.php index a5f79e1995..fc2979d376 100644 --- a/module/upgrade/view/moveextfiles.html.php +++ b/module/upgrade/view/moveextfiles.html.php @@ -3,7 +3,7 @@ * The moveextfiles view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Shujie Tian * @package upgrade * @version $Id: moveextfiles.html.php 5119 2022-02-21 13:22:42Z $ diff --git a/module/upgrade/view/renameobject.html.php b/module/upgrade/view/renameobject.html.php index 952f8d44bd..2fb600c11b 100644 --- a/module/upgrade/view/renameobject.html.php +++ b/module/upgrade/view/renameobject.html.php @@ -3,7 +3,7 @@ * The html template file of renameObject method of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guangming Sun * @package upgrade * @version $Id: renameobject.html.php 4129 2021-11-30 13:07:14Z sunguangming $ diff --git a/module/upgrade/view/selectversion.html.php b/module/upgrade/view/selectversion.html.php index 34d988284d..387b82c2c5 100644 --- a/module/upgrade/view/selectversion.html.php +++ b/module/upgrade/view/selectversion.html.php @@ -3,7 +3,7 @@ * The html template file of select version method of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package upgrade * @version $Id: selectversion.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php index f1d56423fd..6ad0528cb5 100644 --- a/module/upgrade/view/to15guide.html.php +++ b/module/upgrade/view/to15guide.html.php @@ -3,7 +3,7 @@ * The to20 view file of upgrade module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package upgrade * @version $Id$ diff --git a/module/user/control.php b/module/user/control.php index a7fcae9a2c..da51d999e6 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -3,7 +3,7 @@ * The control file of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: control.php 5005 2013-07-03 08:39:11Z chencongzhi520@gmail.com $ @@ -1187,19 +1187,21 @@ class user extends control * @param int $contactListID * @param string $dropdownName mailto|whitelist * @param string $oldUsers + * @param string $extra * @access public * @return string */ - public function ajaxGetContactUsers($contactListID, $dropdownName = 'mailto', $oldUsers = '') + public function ajaxGetContactUsers($contactListID, $dropdownName = 'mailto', $oldUsers = '', $extra = '') { $list = $contactListID ? $this->user->getContactListByID($contactListID) : ''; - $attr = $dropdownName == 'mailto' ? "data-placeholder='{$this->lang->chooseUsersToMail}'" : ''; $users = $this->user->getPairs('devfirst|nodeleted|noclosed', $list ? $list->userList : '', $this->config->maxCount); + if(!empty($extra) && $extra == 'flow') $users = array_merge(array('deptManager' => $this->lang->workflowdatasource->options['deptManager']), $users); if(isset($this->config->user->moreLink)) $this->config->moreLinks[$dropdownName . "[]"] = $this->config->user->moreLink; $defaultUsers = empty($contactListID) ? '' : $list->userList . ',' . trim($oldUsers); + if($extra == 'flow' && empty($defaultUsers)) $defaultUsers = trim($oldUsers); return print(html::select($dropdownName . "[]", $users, $defaultUsers, "class='form-control chosen' multiple $attr")); } diff --git a/module/user/lang/de.php b/module/user/lang/de.php index 5e3bf4ef5f..fdaf5b5c35 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -3,7 +3,7 @@ * The user module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 105f762522..407457c5cd 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -3,7 +3,7 @@ * The user module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php index 8d44bab0e2..092feb0829 100644 --- a/module/user/lang/fr.php +++ b/module/user/lang/fr.php @@ -3,7 +3,7 @@ * The user module English file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 662b2f6e64..82e6f10579 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -3,7 +3,7 @@ * The user module zh-cn file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: zh-cn.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index 4fb85233db..7f8b54474f 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -3,7 +3,7 @@ * The user module zh-tw file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: zh-tw.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ diff --git a/module/user/model.php b/module/user/model.php index cdf6ff206e..b1d3daf19a 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -3,7 +3,7 @@ * The model file of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: model.php 5005 2013-07-03 08:39:11Z chencongzhi520@gmail.com $ diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 6dbc565b1e..76f4e909ef 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -3,7 +3,7 @@ * The batch create view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index 527c8e5882..1187fbacd9 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -3,7 +3,7 @@ * The batch create view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yangyang Shi * @package story * @version $Id$ diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php index 5079528866..3a92c71feb 100644 --- a/module/user/view/bug.html.php +++ b/module/user/view/bug.html.php @@ -3,7 +3,7 @@ * The bug view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: bug.html.php 4771 2013-05-05 07:41:02Z chencongzhi520@gmail.com $ diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 8d248a899d..667e7aaf23 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -3,7 +3,7 @@ * The create view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/user/view/cropavatar.html.php b/module/user/view/cropavatar.html.php index 1ad22383b9..b0d9e3d946 100644 --- a/module/user/view/cropavatar.html.php +++ b/module/user/view/cropavatar.html.php @@ -3,7 +3,7 @@ * The crop avatar view file of user module of ZentaoPms. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: cropavatar.html.php 8669 2021-01-18 16:58:48Z sunguangming$ diff --git a/module/user/view/delete.html.php b/module/user/view/delete.html.php index ca9c4fe1f4..b653ee69e8 100644 --- a/module/user/view/delete.html.php +++ b/module/user/view/delete.html.php @@ -3,7 +3,7 @@ * The delete view file of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package user * @version $Id$ diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php index 4f5dee48da..448cb0298b 100644 --- a/module/user/view/deny.html.php +++ b/module/user/view/deny.html.php @@ -3,7 +3,7 @@ * The html template file of deny method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php index e84f294dcb..545c448081 100644 --- a/module/user/view/dynamic.html.php +++ b/module/user/view/dynamic.html.php @@ -3,7 +3,7 @@ * The action->dynamic view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $ diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 2e7d720c74..21012bdcb5 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: edit.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ diff --git a/module/user/view/execution.html.php b/module/user/view/execution.html.php index 6d5c6bd895..2cca0f0c01 100644 --- a/module/user/view/execution.html.php +++ b/module/user/view/execution.html.php @@ -3,7 +3,7 @@ * The project view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: project.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/user/view/issue.html.php b/module/user/view/issue.html.php index b149e8ee0b..293fd21d2c 100644 --- a/module/user/view/issue.html.php +++ b/module/user/view/issue.html.php @@ -3,7 +3,7 @@ * The risk view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yuchun Li * @package dashboard * @version $Id: risk.html.php 4771 2021-01-13 14:18:02Z $ diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index fc8960ddf7..d70aeca9e7 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -3,7 +3,7 @@ * The html template file of login method of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: login.html.php 5084 2013-07-10 01:31:38Z wyd621@gmail.com $ diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php index 5bae632811..055cacb880 100644 --- a/module/user/view/profile.html.php +++ b/module/user/view/profile.html.php @@ -3,7 +3,7 @@ * The profile view file of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package user * @version $Id: profile.html.php 4976 2013-07-02 08:15:31Z wyd621@gmail.com $ diff --git a/module/user/view/reset.html.php b/module/user/view/reset.html.php index 4803257d7f..d0c344cd26 100644 --- a/module/user/view/reset.html.php +++ b/module/user/view/reset.html.php @@ -3,7 +3,7 @@ * The reset view file of user module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package user * @version $Id$ diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php index e1827571b2..f04dff18f1 100644 --- a/module/user/view/story.html.php +++ b/module/user/view/story.html.php @@ -3,7 +3,7 @@ * The story view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Congzhi Chen * @package dashboard * @version $Id: story.html.php 4771 2013-05-05 07:41:02Z chencongzhi520@gmail.com $ diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index c52df556c1..d8c609f963 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -3,7 +3,7 @@ * The task view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: task.html.php 4771 2013-05-05 07:41:02Z chencongzhi520@gmail.com $ diff --git a/module/user/view/team.html.php b/module/user/view/team.html.php index c8c8ce4304..05ac8cdb5e 100644 --- a/module/user/view/team.html.php +++ b/module/user/view/team.html.php @@ -3,7 +3,7 @@ * The team view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: team.html.php 4129 2013-01-18 01:58:14Z wwccss $ diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php index 9e3cb8914f..2563327df3 100755 --- a/module/user/view/testcase.html.php +++ b/module/user/view/testcase.html.php @@ -3,7 +3,7 @@ * The test view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: test.html.php 1191 2010-11-13 07:30:35Z jajacn@126.com $ diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php index ae38474ac2..76cb6be568 100755 --- a/module/user/view/testtask.html.php +++ b/module/user/view/testtask.html.php @@ -3,7 +3,7 @@ * The testtask view file of my module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id$ diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php index 0417eaf548..a5b9508486 100644 --- a/module/user/view/todo.html.php +++ b/module/user/view/todo.html.php @@ -3,7 +3,7 @@ * The todo view file of dashboard module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package dashboard * @version $Id: todo.html.php 4744 2013-05-04 02:41:05Z wyd621@gmail.com $ diff --git a/module/webhook/control.php b/module/webhook/control.php index 5483282e15..fa44af7ae7 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -3,7 +3,7 @@ * The control file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package webhook * @version $Id$ diff --git a/module/webhook/model.php b/module/webhook/model.php index 209f021344..02428402bd 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -3,7 +3,7 @@ * The model file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package webhook * @version $Id$ diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php index e297af5fa7..208070ddb2 100644 --- a/module/webhook/view/browse.html.php +++ b/module/webhook/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package webhook * @version $Id$ diff --git a/module/webhook/view/choosedept.html.php b/module/webhook/view/choosedept.html.php index d580e01fa2..b962c1ee2a 100644 --- a/module/webhook/view/choosedept.html.php +++ b/module/webhook/view/choosedept.html.php @@ -3,7 +3,7 @@ * The choose dept view file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package webhook * @version $Id$ diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php index 9221d2df84..553cd2e52b 100644 --- a/module/webhook/view/create.html.php +++ b/module/webhook/view/create.html.php @@ -3,7 +3,7 @@ * The create view file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package webhook * @version $Id$ diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php index 2109b61809..ad1b8ce1ee 100644 --- a/module/webhook/view/edit.html.php +++ b/module/webhook/view/edit.html.php @@ -3,7 +3,7 @@ * The edit view file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package webhook * @version $Id$ diff --git a/module/webhook/view/header.html.php b/module/webhook/view/header.html.php index b00b76db9a..0da8bb39f2 100644 --- a/module/webhook/view/header.html.php +++ b/module/webhook/view/header.html.php @@ -3,7 +3,7 @@ * The header view file of webhook module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package webhook * @version $Id$ diff --git a/module/webhook/view/log.html.php b/module/webhook/view/log.html.php index a7ddaedc4e..7a9569a729 100644 --- a/module/webhook/view/log.html.php +++ b/module/webhook/view/log.html.php @@ -3,7 +3,7 @@ * The log view file of log module of ZenTaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package log * @version $Id$ diff --git a/module/weekly/lang/de.php b/module/weekly/lang/de.php index c0f42439ff..18608dd719 100644 --- a/module/weekly/lang/de.php +++ b/module/weekly/lang/de.php @@ -3,7 +3,7 @@ * The weekly module lang file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package weekly * @version $Id diff --git a/module/weekly/lang/en.php b/module/weekly/lang/en.php index c0f42439ff..18608dd719 100644 --- a/module/weekly/lang/en.php +++ b/module/weekly/lang/en.php @@ -3,7 +3,7 @@ * The weekly module lang file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package weekly * @version $Id diff --git a/module/weekly/lang/fr.php b/module/weekly/lang/fr.php index c0f42439ff..18608dd719 100644 --- a/module/weekly/lang/fr.php +++ b/module/weekly/lang/fr.php @@ -3,7 +3,7 @@ * The weekly module lang file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package weekly * @version $Id diff --git a/module/weekly/lang/vi.php b/module/weekly/lang/vi.php index c0f42439ff..18608dd719 100644 --- a/module/weekly/lang/vi.php +++ b/module/weekly/lang/vi.php @@ -3,7 +3,7 @@ * The weekly module lang file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package weekly * @version $Id diff --git a/module/weekly/lang/zh-cn.php b/module/weekly/lang/zh-cn.php index d0fc86ef86..a57fd3b190 100644 --- a/module/weekly/lang/zh-cn.php +++ b/module/weekly/lang/zh-cn.php @@ -3,7 +3,7 @@ * The weekly module lang file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package weekly * @version $Id diff --git a/module/weekly/lang/zh-tw.php b/module/weekly/lang/zh-tw.php index 20f44ed51f..68dfbf19ae 100644 --- a/module/weekly/lang/zh-tw.php +++ b/module/weekly/lang/zh-tw.php @@ -3,7 +3,7 @@ * The weekly module lang file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package weekly * @version $Id diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php index ceaf917100..9ccb5ec4e5 100644 --- a/module/weekly/view/index.html.php +++ b/module/weekly/view/index.html.php @@ -3,7 +3,7 @@ * The html template file of index method of index module of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ diff --git a/roadrunner/cron-worker.php b/roadrunner/cron-worker.php index f58bdd732e..468fde14c0 100644 --- a/roadrunner/cron-worker.php +++ b/roadrunner/cron-worker.php @@ -5,7 +5,7 @@ * All request of entries should be routed by this router. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package ZenTaoPMS * @version $Id: index.php 5036 2013-07-06 05:26:44Z wyd621@gmail.com $ diff --git a/sdk/php/zentao.php b/sdk/php/zentao.php index efd080a5f6..2310989d49 100644 --- a/sdk/php/zentao.php +++ b/sdk/php/zentao.php @@ -4,7 +4,7 @@ * This is the PHP-SDK class of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author * @package api * @version v1.0.0 diff --git a/test/lib/init.php b/test/lib/init.php index 16afc25970..6a56270c9c 100644 --- a/test/lib/init.php +++ b/test/lib/init.php @@ -6,7 +6,7 @@ * All request of entries should be routed by this router. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guanxing * @package ZenTaoPMS * @version $Id: $ diff --git a/test/lib/utils.php b/test/lib/utils.php index fbe3b538cc..86430cd9ef 100644 --- a/test/lib/utils.php +++ b/test/lib/utils.php @@ -3,7 +3,7 @@ * Utils for ZenTaoPMS testing. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guanxing * @package ZenTaoPMS * @version $Id: $ diff --git a/tools/packDeb.php b/tools/packDeb.php index b38b578ff3..25545d2555 100644 --- a/tools/packDeb.php +++ b/tools/packDeb.php @@ -54,7 +54,7 @@ foreach(array('zh-cn', 'en') as $langType) $command .= "sed -i 's/index.php/\/zentao\/index.php/' zentao/www/.htaccess\n"; $command .= "cd ../../\n"; - $command .= "sudo dpkg -b buildroot/ {$packPrefix}_{$version}_php{$phpVersion}_1_all.deb\n"; + $command .= "sudo dpkg -b buildroot/ {$packPrefix}.{$version}.php{$phpVersion}.1.all.deb\n"; $command .= "mv *.deb ../../\n"; $command .= "rm -rf buildroot\n"; diff --git a/tools/packRpm.php b/tools/packRpm.php index 66d40ceb6f..349b307df6 100644 --- a/tools/packRpm.php +++ b/tools/packRpm.php @@ -60,9 +60,7 @@ foreach(array('zh-cn', 'en') as $langType) $command .= "cd ../../\n"; $command .= "rpmbuild --define \"_topdir \${PWD}/rpmbuild\" -ba rpmbuild/SPECS/zentaopms.spec\n"; - $command .= "cp rpmbuild/RPMS/noarch/$dirName-$version-1.noarch.rpm ./{$dirName}-{$version}-php{$phpVersion}-1.noarch.rpm\n"; - - $command .= "mv {$dirName}-{$version}-php{$phpVersion}-1.noarch.rpm ../../\n"; + $command .= "cp rpmbuild/RPMS/noarch/$dirName-$version-1.noarch.rpm ../../{$packPrefix}.{$version}.php{$phpVersion}.1.noarch.rpm\n"; $command .= "rm -rf rpmbuild\n"; diff --git a/www/api.php b/www/api.php index 6fab206621..c49b0b40ee 100644 --- a/www/api.php +++ b/www/api.php @@ -5,7 +5,7 @@ * All request of entries should be routed by this router. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package ZenTaoPMS * @version $Id: index.php 5036 2013-07-06 05:26:44Z wyd621@gmail.com $ diff --git a/www/index.php b/www/index.php index 6e1527e16d..0c283f75ca 100644 --- a/www/index.php +++ b/www/index.php @@ -5,7 +5,7 @@ * All request should be routed by this router. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: index.php 5036 2013-07-06 05:26:44Z wyd621@gmail.com $ diff --git a/www/init.php b/www/init.php index 23acb0c613..96361885e5 100644 --- a/www/init.php +++ b/www/init.php @@ -6,7 +6,7 @@ * All request of entries should be routed by this router. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Guanxing * @package ZenTaoPMS * @version $Id: $ diff --git a/www/install.php.tmp b/www/install.php.tmp index 6d7e9fdfd1..122755b3fa 100644 --- a/www/install.php.tmp +++ b/www/install.php.tmp @@ -3,7 +3,7 @@ * The install router file of ZenTaoPMS. * * @copyright Copyright 2009-2013 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: install.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $ diff --git a/www/js/fingerprint/Gruntfile.js b/www/js/fingerprint/Gruntfile.js deleted file mode 100644 index d9352c8301..0000000000 --- a/www/js/fingerprint/Gruntfile.js +++ /dev/null @@ -1,31 +0,0 @@ -module.exports = function(grunt) { - - // Project configuration. - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - uglify: { - options: { - banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> - v<%= pkg.version %> */\n' - }, - build: { - src: 'fingerprint.js', - dest: 'build/fingerprint.min.js' - } - }, - jshint: { - file: ['Gruntfile.js', 'fingerprint.js', 'specs/**/*_spec.js'], - options: { - eqnull: true, - '-W086': true //W086: Expected a 'break' statement before 'case'. - } - } - }); - - // Load the plugin that provides the "uglify" task. - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - - // Default task(s). - grunt.registerTask('default', ['jshint', 'uglify']); - -}; \ No newline at end of file diff --git a/www/js/fingerprint/fingerprint.js b/www/js/fingerprint/fingerprint.js deleted file mode 100644 index a6982175ff..0000000000 --- a/www/js/fingerprint/fingerprint.js +++ /dev/null @@ -1,285 +0,0 @@ -/* -* fingerprintJS 0.5.4 - Fast browser fingerprint library -* https://github.com/Valve/fingerprintjs -* Copyright (c) 2013 Valentin Vasilyev (valentin.vasilyev@outlook.com) -* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -* ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -;(function (name, context, definition) { - if (typeof module !== 'undefined' && module.exports) { module.exports = definition(); } - else if (typeof define === 'function' && define.amd) { define(definition); } - else { context[name] = definition(); } -})('Fingerprint', this, function () { - 'use strict'; - - var Fingerprint = function (options) { - var nativeForEach, nativeMap; - nativeForEach = Array.prototype.forEach; - nativeMap = Array.prototype.map; - - this.each = function (obj, iterator, context) { - if (obj === null) { - return; - } - if (nativeForEach && obj.forEach === nativeForEach) { - obj.forEach(iterator, context); - } else if (obj.length === +obj.length) { - for (var i = 0, l = obj.length; i < l; i++) { - if (iterator.call(context, obj[i], i, obj) === {}) return; - } - } else { - for (var key in obj) { - if (obj.hasOwnProperty(key)) { - if (iterator.call(context, obj[key], key, obj) === {}) return; - } - } - } - }; - - this.map = function(obj, iterator, context) { - var results = []; - // Not using strict equality so that this acts as a - // shortcut to checking for `null` and `undefined`. - if (obj == null) return results; - if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context); - this.each(obj, function(value, index, list) { - results[results.length] = iterator.call(context, value, index, list); - }); - return results; - }; - - if (typeof options == 'object'){ - this.hasher = options.hasher; - this.screen_resolution = options.screen_resolution; - this.screen_orientation = options.screen_orientation; - this.canvas = options.canvas; - this.ie_activex = options.ie_activex; - } else if(typeof options == 'function'){ - this.hasher = options; - } - }; - - Fingerprint.prototype = { - get: function(){ - var keys = []; - keys.push(navigator.userAgent); - keys.push(navigator.language); - keys.push(screen.colorDepth); - if (this.screen_resolution) { - var resolution = this.getScreenResolution(); - if (typeof resolution !== 'undefined'){ // headless browsers, such as phantomjs - keys.push(this.getScreenResolution().join('x')); - } - } - keys.push(new Date().getTimezoneOffset()); - keys.push(this.hasSessionStorage()); - keys.push(this.hasLocalStorage()); - keys.push(!!window.indexedDB); - //body might not be defined at this point or removed programmatically - if(document.body){ - keys.push(typeof(document.body.addBehavior)); - } else { - keys.push(typeof undefined); - } - keys.push(typeof(window.openDatabase)); - keys.push(navigator.cpuClass); - keys.push(navigator.platform); - keys.push(navigator.doNotTrack); - keys.push(this.getPluginsString()); - if(this.canvas && this.isCanvasSupported()){ - keys.push(this.getCanvasFingerprint()); - } - if(this.hasher){ - return this.hasher(keys.join('###'), 31); - } else { - return this.murmurhash3_32_gc(keys.join('###'), 31); - } - }, - - /** - * JS Implementation of MurmurHash3 (r136) (as of May 20, 2011) - * - * @author Gary Court - * @see http://github.com/garycourt/murmurhash-js - * @author Austin Appleby - * @see http://sites.google.com/site/murmurhash/ - * - * @param {string} key ASCII only - * @param {number} seed Positive integer only - * @return {number} 32-bit positive integer hash - */ - - murmurhash3_32_gc: function(key, seed) { - var remainder, bytes, h1, h1b, c1, c2, k1, i; - - remainder = key.length & 3; // key.length % 4 - bytes = key.length - remainder; - h1 = seed; - c1 = 0xcc9e2d51; - c2 = 0x1b873593; - i = 0; - - while (i < bytes) { - k1 = - ((key.charCodeAt(i) & 0xff)) | - ((key.charCodeAt(++i) & 0xff) << 8) | - ((key.charCodeAt(++i) & 0xff) << 16) | - ((key.charCodeAt(++i) & 0xff) << 24); - ++i; - - k1 = ((((k1 & 0xffff) * c1) + ((((k1 >>> 16) * c1) & 0xffff) << 16))) & 0xffffffff; - k1 = (k1 << 15) | (k1 >>> 17); - k1 = ((((k1 & 0xffff) * c2) + ((((k1 >>> 16) * c2) & 0xffff) << 16))) & 0xffffffff; - - h1 ^= k1; - h1 = (h1 << 13) | (h1 >>> 19); - h1b = ((((h1 & 0xffff) * 5) + ((((h1 >>> 16) * 5) & 0xffff) << 16))) & 0xffffffff; - h1 = (((h1b & 0xffff) + 0x6b64) + ((((h1b >>> 16) + 0xe654) & 0xffff) << 16)); - } - - k1 = 0; - - switch (remainder) { - case 3: k1 ^= (key.charCodeAt(i + 2) & 0xff) << 16; - case 2: k1 ^= (key.charCodeAt(i + 1) & 0xff) << 8; - case 1: k1 ^= (key.charCodeAt(i) & 0xff); - - k1 = (((k1 & 0xffff) * c1) + ((((k1 >>> 16) * c1) & 0xffff) << 16)) & 0xffffffff; - k1 = (k1 << 15) | (k1 >>> 17); - k1 = (((k1 & 0xffff) * c2) + ((((k1 >>> 16) * c2) & 0xffff) << 16)) & 0xffffffff; - h1 ^= k1; - } - - h1 ^= key.length; - - h1 ^= h1 >>> 16; - h1 = (((h1 & 0xffff) * 0x85ebca6b) + ((((h1 >>> 16) * 0x85ebca6b) & 0xffff) << 16)) & 0xffffffff; - h1 ^= h1 >>> 13; - h1 = ((((h1 & 0xffff) * 0xc2b2ae35) + ((((h1 >>> 16) * 0xc2b2ae35) & 0xffff) << 16))) & 0xffffffff; - h1 ^= h1 >>> 16; - - return h1 >>> 0; - }, - - // https://bugzilla.mozilla.org/show_bug.cgi?id=781447 - hasLocalStorage: function () { - try{ - return !!window.localStorage; - } catch(e) { - return true; // SecurityError when referencing it means it exists - } - }, - - hasSessionStorage: function () { - try{ - return !!window.sessionStorage; - } catch(e) { - return true; // SecurityError when referencing it means it exists - } - }, - - isCanvasSupported: function () { - var elem = document.createElement('canvas'); - return !!(elem.getContext && elem.getContext('2d')); - }, - - isIE: function () { - if(navigator.appName === 'Microsoft Internet Explorer') { - return true; - } else if(navigator.appName === 'Netscape' && /Trident/.test(navigator.userAgent)){// IE 11 - return true; - } - return false; - }, - - getPluginsString: function () { - if(this.isIE() && this.ie_activex){ - return this.getIEPluginsString(); - } else { - return this.getRegularPluginsString(); - } - }, - - getRegularPluginsString: function () { - return this.map(navigator.plugins, function (p) { - var mimeTypes = this.map(p, function(mt){ - return [mt.type, mt.suffixes].join('~'); - }).join(','); - return [p.name, p.description, mimeTypes].join('::'); - }, this).join(';'); - }, - - getIEPluginsString: function () { - if(window.ActiveXObject){ - var names = ['ShockwaveFlash.ShockwaveFlash',//flash plugin - 'AcroPDF.PDF', // Adobe PDF reader 7+ - 'PDF.PdfCtrl', // Adobe PDF reader 6 and earlier, brrr - 'QuickTime.QuickTime', // QuickTime - // 5 versions of real players - 'rmocx.RealPlayer G2 Control', - 'rmocx.RealPlayer G2 Control.1', - 'RealPlayer.RealPlayer(tm) ActiveX Control (32-bit)', - 'RealVideo.RealVideo(tm) ActiveX Control (32-bit)', - 'RealPlayer', - 'SWCtl.SWCtl', // ShockWave player - 'WMPlayer.OCX', // Windows media player - 'AgControl.AgControl', // Silverlight - 'Skype.Detection']; - - // starting to detect plugins in IE - return this.map(names, function(name){ - try{ - new ActiveXObject(name); - return name; - } catch(e){ - return null; - } - }).join(';'); - } else { - return ""; // behavior prior version 0.5.0, not breaking backwards compat. - } - }, - - getScreenResolution: function () { - var resolution; - if(this.screen_orientation){ - resolution = (screen.height > screen.width) ? [screen.height, screen.width] : [screen.width, screen.height]; - }else{ - resolution = [screen.height, screen.width]; - } - return resolution; - }, - - getCanvasFingerprint: function () { - var canvas = document.createElement('canvas'); - var ctx = canvas.getContext('2d'); - // https://www.browserleaks.com/canvas#how-does-it-work - var txt = 'http://valve.github.io'; - ctx.textBaseline = "top"; - ctx.font = "14px 'Arial'"; - ctx.textBaseline = "alphabetic"; - ctx.fillStyle = "#f60"; - ctx.fillRect(125,1,62,20); - ctx.fillStyle = "#069"; - ctx.fillText(txt, 2, 15); - ctx.fillStyle = "rgba(102, 204, 0, 0.7)"; - ctx.fillText(txt, 4, 17); - return canvas.toDataURL(); - } - }; - - - return Fingerprint; - -}); diff --git a/www/js/fingerprint/package.json b/www/js/fingerprint/package.json deleted file mode 100644 index 27bcb3b969..0000000000 --- a/www/js/fingerprint/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "fingerprintjs", - "version": "0.5.3", - "main": "fingerprint.js", - "devDependencies": { - "grunt": "~0.4.2", - "grunt-contrib-jshint": "~0.6.3", - "grunt-contrib-uglify": "~0.2.2" - } -} diff --git a/www/js/fingerprint/specs/fingerprint_spec.js b/www/js/fingerprint/specs/fingerprint_spec.js deleted file mode 100644 index f35d0dc3ff..0000000000 --- a/www/js/fingerprint/specs/fingerprint_spec.js +++ /dev/null @@ -1,124 +0,0 @@ -describe("Fingerprint", function(){ - beforeEach(function() { - this.addMatchers({ - toBeInstanceOf : function(expected) { - return this.actual instanceof expected && this.actual.length > 0; - }, - toBeA: function(expected) { - return typeof this.actual === expected; - } - }); - }); - describe("new Fingerprint", function(){ - it("Creates a new instance of Fingerprint", function(){ - expect(new Fingerprint()).not.toBeNull(); - }); - - it("Accepts a custom hashing function as argument", function(){ - var hasher = function(){return 31;}; - expect(new Fingerprint(hasher)).not.toBeNull(); - }); - - it("Accepts a custom hasing function as options argument", function(){ - var hasher = function(){return 31;}; - expect(new Fingerprint({hasher: hasher})).not.toBeNull(); - }); - }); - - describe("#get", function(){ - it("Calculates fingerprint with built-in hashing if no custom hashing is given", function(){ - var fingerprint = new Fingerprint(); - spyOn(fingerprint, 'murmurhash3_32_gc'); - fingerprint.get(); - expect(fingerprint.murmurhash3_32_gc).toHaveBeenCalled(); - }); - - it("Calculates fingerprint with custom hashing if it is given as an argument", function(){ - var hasher = function(){return 'abcdef';}; - var fingerprint = new Fingerprint(hasher); - expect(fingerprint.get()).toEqual('abcdef'); - }); - - it("Calculates fingerprint with custom hashing if it is given as an options argument", function(){ - var hasher = function(){return 'abcdef';}; - var fingerprint = new Fingerprint({hasher: hasher}); - expect(fingerprint.get()).toEqual('abcdef'); - }); - - it('Calculates fingerprint with canvas fingerprinting if it is said to do so', function(){ - var fp = new Fingerprint({canvas: true}); - spyOn(fp, 'getCanvasFingerprint'); - fp.get(); - expect(fp.getCanvasFingerprint).toHaveBeenCalled(); - }); - - - it('Does not try to use canvas fingerprinting when not told to(version 1)', function(){ - var fp = new Fingerprint({canvas: false}); - spyOn(fp, 'getCanvasFingerprint'); - fp.get(); - expect(fp.getCanvasFingerprint).not.toHaveBeenCalled(); - }); - - it('Does not try to use canvas fingerprinting when not told to(version 2)', function(){ - var fp = new Fingerprint(); - spyOn(fp, 'getCanvasFingerprint'); - fp.get(); - expect(fp.getCanvasFingerprint).not.toHaveBeenCalled(); - }); - - it('Calculates fingerprint with ActiveX fingerprinting if it is said to do so', function(){ - var fp = new Fingerprint({ie_activex: true}); - spyOn(fp, 'isIE').andReturn(true); - spyOn(fp, 'getIEPluginsString'); - fp.get(); - expect(fp.getIEPluginsString).toHaveBeenCalled(); - }); - - - it('Does not try to use ActiveX fingerprinting when not told to(version 1)', function(){ - var fp = new Fingerprint({ie_activex: false}); - spyOn(fp, 'getIEPluginsString'); - fp.get(); - expect(fp.getIEPluginsString).not.toHaveBeenCalled(); - }); - - it('Does not try to use ActiveX fingerprinting when not told to(version 2)', function(){ - var fp = new Fingerprint(); - spyOn(fp, 'getIEPluginsString'); - fp.get(); - expect(fp.getIEPluginsString).not.toHaveBeenCalled(); - }); - - it('Calculates fingerprint accessing screen resolution if it is said to do so', function(){ - var fp = new Fingerprint({screen_resolution: true}); - spyOn(fp, 'getScreenResolution'); - fp.get(); - expect(fp.getScreenResolution).toHaveBeenCalled(); - }); - - it('Does not try to use screen resolution when not told to', function(){ - var fp = new Fingerprint(); - spyOn(fp, 'getScreenResolution'); - fp.get(); - expect(fp.getScreenResolution).not.toHaveBeenCalled(); - }); - - it("Returns a number as a fingerprint value when used with a built-in hashing function", function(){ - var fingerprint = new Fingerprint(); - expect(fingerprint.get()).toBeA('number'); - }); - - it('Returns a string from getCanvasFingerprint function', function(){ - var fp = new Fingerprint({canvas: true}); - expect(fp.getCanvasFingerprint()).toBeA('string'); - }); - - it('Does not fail when document.body is null', function(){ - var body = document.body.parentNode.removeChild(document.body); - var fingerprint = new Fingerprint(); - expect(fingerprint.get()).toBeA('number'); - document.body = body; - }); - }); -}); \ No newline at end of file diff --git a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine-html.js b/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine-html.js deleted file mode 100644 index 543d56963e..0000000000 --- a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine-html.js +++ /dev/null @@ -1,681 +0,0 @@ -jasmine.HtmlReporterHelpers = {}; - -jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) { - var el = document.createElement(type); - - for (var i = 2; i < arguments.length; i++) { - var child = arguments[i]; - - if (typeof child === 'string') { - el.appendChild(document.createTextNode(child)); - } else { - if (child) { - el.appendChild(child); - } - } - } - - for (var attr in attrs) { - if (attr == "className") { - el[attr] = attrs[attr]; - } else { - el.setAttribute(attr, attrs[attr]); - } - } - - return el; -}; - -jasmine.HtmlReporterHelpers.getSpecStatus = function(child) { - var results = child.results(); - var status = results.passed() ? 'passed' : 'failed'; - if (results.skipped) { - status = 'skipped'; - } - - return status; -}; - -jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) { - var parentDiv = this.dom.summary; - var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite'; - var parent = child[parentSuite]; - - if (parent) { - if (typeof this.views.suites[parent.id] == 'undefined') { - this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views); - } - parentDiv = this.views.suites[parent.id].element; - } - - parentDiv.appendChild(childElement); -}; - - -jasmine.HtmlReporterHelpers.addHelpers = function(ctor) { - for(var fn in jasmine.HtmlReporterHelpers) { - ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn]; - } -}; - -jasmine.HtmlReporter = function(_doc) { - var self = this; - var doc = _doc || window.document; - - var reporterView; - - var dom = {}; - - // Jasmine Reporter Public Interface - self.logRunningSpecs = false; - - self.reportRunnerStarting = function(runner) { - var specs = runner.specs() || []; - - if (specs.length == 0) { - return; - } - - createReporterDom(runner.env.versionString()); - doc.body.appendChild(dom.reporter); - setExceptionHandling(); - - reporterView = new jasmine.HtmlReporter.ReporterView(dom); - reporterView.addSpecs(specs, self.specFilter); - }; - - self.reportRunnerResults = function(runner) { - reporterView && reporterView.complete(); - }; - - self.reportSuiteResults = function(suite) { - reporterView.suiteComplete(suite); - }; - - self.reportSpecStarting = function(spec) { - if (self.logRunningSpecs) { - self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...'); - } - }; - - self.reportSpecResults = function(spec) { - reporterView.specComplete(spec); - }; - - self.log = function() { - var console = jasmine.getGlobal().console; - if (console && console.log) { - if (console.log.apply) { - console.log.apply(console, arguments); - } else { - console.log(arguments); // ie fix: console.log.apply doesn't exist on ie - } - } - }; - - self.specFilter = function(spec) { - if (!focusedSpecName()) { - return true; - } - - return spec.getFullName().indexOf(focusedSpecName()) === 0; - }; - - return self; - - function focusedSpecName() { - var specName; - - (function memoizeFocusedSpec() { - if (specName) { - return; - } - - var paramMap = []; - var params = jasmine.HtmlReporter.parameters(doc); - - for (var i = 0; i < params.length; i++) { - var p = params[i].split('='); - paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); - } - - specName = paramMap.spec; - })(); - - return specName; - } - - function createReporterDom(version) { - dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' }, - dom.banner = self.createDom('div', { className: 'banner' }, - self.createDom('span', { className: 'title' }, "Jasmine "), - self.createDom('span', { className: 'version' }, version)), - - dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}), - dom.alert = self.createDom('div', {className: 'alert'}, - self.createDom('span', { className: 'exceptions' }, - self.createDom('label', { className: 'label', 'for': 'no_try_catch' }, 'No try/catch'), - self.createDom('input', { id: 'no_try_catch', type: 'checkbox' }))), - dom.results = self.createDom('div', {className: 'results'}, - dom.summary = self.createDom('div', { className: 'summary' }), - dom.details = self.createDom('div', { id: 'details' })) - ); - } - - function noTryCatch() { - return window.location.search.match(/catch=false/); - } - - function searchWithCatch() { - var params = jasmine.HtmlReporter.parameters(window.document); - var removed = false; - var i = 0; - - while (!removed && i < params.length) { - if (params[i].match(/catch=/)) { - params.splice(i, 1); - removed = true; - } - i++; - } - if (jasmine.CATCH_EXCEPTIONS) { - params.push("catch=false"); - } - - return params.join("&"); - } - - function setExceptionHandling() { - var chxCatch = document.getElementById('no_try_catch'); - - if (noTryCatch()) { - chxCatch.setAttribute('checked', true); - jasmine.CATCH_EXCEPTIONS = false; - } - chxCatch.onclick = function() { - window.location.search = searchWithCatch(); - }; - } -}; -jasmine.HtmlReporter.parameters = function(doc) { - var paramStr = doc.location.search.substring(1); - var params = []; - - if (paramStr.length > 0) { - params = paramStr.split('&'); - } - return params; -} -jasmine.HtmlReporter.sectionLink = function(sectionName) { - var link = '?'; - var params = []; - - if (sectionName) { - params.push('spec=' + encodeURIComponent(sectionName)); - } - if (!jasmine.CATCH_EXCEPTIONS) { - params.push("catch=false"); - } - if (params.length > 0) { - link += params.join("&"); - } - - return link; -}; -jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter); -jasmine.HtmlReporter.ReporterView = function(dom) { - this.startedAt = new Date(); - this.runningSpecCount = 0; - this.completeSpecCount = 0; - this.passedCount = 0; - this.failedCount = 0; - this.skippedCount = 0; - - this.createResultsMenu = function() { - this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'}, - this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'), - ' | ', - this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing')); - - this.summaryMenuItem.onclick = function() { - dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, ''); - }; - - this.detailsMenuItem.onclick = function() { - showDetails(); - }; - }; - - this.addSpecs = function(specs, specFilter) { - this.totalSpecCount = specs.length; - - this.views = { - specs: {}, - suites: {} - }; - - for (var i = 0; i < specs.length; i++) { - var spec = specs[i]; - this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views); - if (specFilter(spec)) { - this.runningSpecCount++; - } - } - }; - - this.specComplete = function(spec) { - this.completeSpecCount++; - - if (isUndefined(this.views.specs[spec.id])) { - this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom); - } - - var specView = this.views.specs[spec.id]; - - switch (specView.status()) { - case 'passed': - this.passedCount++; - break; - - case 'failed': - this.failedCount++; - break; - - case 'skipped': - this.skippedCount++; - break; - } - - specView.refresh(); - this.refresh(); - }; - - this.suiteComplete = function(suite) { - var suiteView = this.views.suites[suite.id]; - if (isUndefined(suiteView)) { - return; - } - suiteView.refresh(); - }; - - this.refresh = function() { - - if (isUndefined(this.resultsMenu)) { - this.createResultsMenu(); - } - - // currently running UI - if (isUndefined(this.runningAlert)) { - this.runningAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "runningAlert bar" }); - dom.alert.appendChild(this.runningAlert); - } - this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount); - - // skipped specs UI - if (isUndefined(this.skippedAlert)) { - this.skippedAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "skippedAlert bar" }); - } - - this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all"; - - if (this.skippedCount === 1 && isDefined(dom.alert)) { - dom.alert.appendChild(this.skippedAlert); - } - - // passing specs UI - if (isUndefined(this.passedAlert)) { - this.passedAlert = this.createDom('span', { href: jasmine.HtmlReporter.sectionLink(), className: "passingAlert bar" }); - } - this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount); - - // failing specs UI - if (isUndefined(this.failedAlert)) { - this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"}); - } - this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount); - - if (this.failedCount === 1 && isDefined(dom.alert)) { - dom.alert.appendChild(this.failedAlert); - dom.alert.appendChild(this.resultsMenu); - } - - // summary info - this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount); - this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing"; - }; - - this.complete = function() { - dom.alert.removeChild(this.runningAlert); - - this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all"; - - if (this.failedCount === 0) { - dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount))); - } else { - showDetails(); - } - - dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s")); - }; - - return this; - - function showDetails() { - if (dom.reporter.className.search(/showDetails/) === -1) { - dom.reporter.className += " showDetails"; - } - } - - function isUndefined(obj) { - return typeof obj === 'undefined'; - } - - function isDefined(obj) { - return !isUndefined(obj); - } - - function specPluralizedFor(count) { - var str = count + " spec"; - if (count > 1) { - str += "s" - } - return str; - } - -}; - -jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView); - - -jasmine.HtmlReporter.SpecView = function(spec, dom, views) { - this.spec = spec; - this.dom = dom; - this.views = views; - - this.symbol = this.createDom('li', { className: 'pending' }); - this.dom.symbolSummary.appendChild(this.symbol); - - this.summary = this.createDom('div', { className: 'specSummary' }, - this.createDom('a', { - className: 'description', - href: jasmine.HtmlReporter.sectionLink(this.spec.getFullName()), - title: this.spec.getFullName() - }, this.spec.description) - ); - - this.detail = this.createDom('div', { className: 'specDetail' }, - this.createDom('a', { - className: 'description', - href: '?spec=' + encodeURIComponent(this.spec.getFullName()), - title: this.spec.getFullName() - }, this.spec.getFullName()) - ); -}; - -jasmine.HtmlReporter.SpecView.prototype.status = function() { - return this.getSpecStatus(this.spec); -}; - -jasmine.HtmlReporter.SpecView.prototype.refresh = function() { - this.symbol.className = this.status(); - - switch (this.status()) { - case 'skipped': - break; - - case 'passed': - this.appendSummaryToSuiteDiv(); - break; - - case 'failed': - this.appendSummaryToSuiteDiv(); - this.appendFailureDetail(); - break; - } -}; - -jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() { - this.summary.className += ' ' + this.status(); - this.appendToSummary(this.spec, this.summary); -}; - -jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() { - this.detail.className += ' ' + this.status(); - - var resultItems = this.spec.results().getItems(); - var messagesDiv = this.createDom('div', { className: 'messages' }); - - for (var i = 0; i < resultItems.length; i++) { - var result = resultItems[i]; - - if (result.type == 'log') { - messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString())); - } else if (result.type == 'expect' && result.passed && !result.passed()) { - messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message)); - - if (result.trace.stack) { - messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); - } - } - } - - if (messagesDiv.childNodes.length > 0) { - this.detail.appendChild(messagesDiv); - this.dom.details.appendChild(this.detail); - } -}; - -jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) { - this.suite = suite; - this.dom = dom; - this.views = views; - - this.element = this.createDom('div', { className: 'suite' }, - this.createDom('a', { className: 'description', href: jasmine.HtmlReporter.sectionLink(this.suite.getFullName()) }, this.suite.description) - ); - - this.appendToSummary(this.suite, this.element); -}; - -jasmine.HtmlReporter.SuiteView.prototype.status = function() { - return this.getSpecStatus(this.suite); -}; - -jasmine.HtmlReporter.SuiteView.prototype.refresh = function() { - this.element.className += " " + this.status(); -}; - -jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView); - -/* @deprecated Use jasmine.HtmlReporter instead - */ -jasmine.TrivialReporter = function(doc) { - this.document = doc || document; - this.suiteDivs = {}; - this.logRunningSpecs = false; -}; - -jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) { - var el = document.createElement(type); - - for (var i = 2; i < arguments.length; i++) { - var child = arguments[i]; - - if (typeof child === 'string') { - el.appendChild(document.createTextNode(child)); - } else { - if (child) { el.appendChild(child); } - } - } - - for (var attr in attrs) { - if (attr == "className") { - el[attr] = attrs[attr]; - } else { - el.setAttribute(attr, attrs[attr]); - } - } - - return el; -}; - -jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { - var showPassed, showSkipped; - - this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' }, - this.createDom('div', { className: 'banner' }, - this.createDom('div', { className: 'logo' }, - this.createDom('span', { className: 'title' }, "Jasmine"), - this.createDom('span', { className: 'version' }, runner.env.versionString())), - this.createDom('div', { className: 'options' }, - "Show ", - showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }), - this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "), - showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }), - this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped") - ) - ), - - this.runnerDiv = this.createDom('div', { className: 'runner running' }, - this.createDom('a', { className: 'run_spec', href: '?' }, "run all"), - this.runnerMessageSpan = this.createDom('span', {}, "Running..."), - this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, "")) - ); - - this.document.body.appendChild(this.outerDiv); - - var suites = runner.suites(); - for (var i = 0; i < suites.length; i++) { - var suite = suites[i]; - var suiteDiv = this.createDom('div', { className: 'suite' }, - this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"), - this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description)); - this.suiteDivs[suite.id] = suiteDiv; - var parentDiv = this.outerDiv; - if (suite.parentSuite) { - parentDiv = this.suiteDivs[suite.parentSuite.id]; - } - parentDiv.appendChild(suiteDiv); - } - - this.startedAt = new Date(); - - var self = this; - showPassed.onclick = function(evt) { - if (showPassed.checked) { - self.outerDiv.className += ' show-passed'; - } else { - self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, ''); - } - }; - - showSkipped.onclick = function(evt) { - if (showSkipped.checked) { - self.outerDiv.className += ' show-skipped'; - } else { - self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, ''); - } - }; -}; - -jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) { - var results = runner.results(); - var className = (results.failedCount > 0) ? "runner failed" : "runner passed"; - this.runnerDiv.setAttribute("class", className); - //do it twice for IE - this.runnerDiv.setAttribute("className", className); - var specs = runner.specs(); - var specCount = 0; - for (var i = 0; i < specs.length; i++) { - if (this.specFilter(specs[i])) { - specCount++; - } - } - var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s"); - message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"; - this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild); - - this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString())); -}; - -jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) { - var results = suite.results(); - var status = results.passed() ? 'passed' : 'failed'; - if (results.totalCount === 0) { // todo: change this to check results.skipped - status = 'skipped'; - } - this.suiteDivs[suite.id].className += " " + status; -}; - -jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) { - if (this.logRunningSpecs) { - this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...'); - } -}; - -jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { - var results = spec.results(); - var status = results.passed() ? 'passed' : 'failed'; - if (results.skipped) { - status = 'skipped'; - } - var specDiv = this.createDom('div', { className: 'spec ' + status }, - this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), - this.createDom('a', { - className: 'description', - href: '?spec=' + encodeURIComponent(spec.getFullName()), - title: spec.getFullName() - }, spec.description)); - - - var resultItems = results.getItems(); - var messagesDiv = this.createDom('div', { className: 'messages' }); - for (var i = 0; i < resultItems.length; i++) { - var result = resultItems[i]; - - if (result.type == 'log') { - messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString())); - } else if (result.type == 'expect' && result.passed && !result.passed()) { - messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message)); - - if (result.trace.stack) { - messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); - } - } - } - - if (messagesDiv.childNodes.length > 0) { - specDiv.appendChild(messagesDiv); - } - - this.suiteDivs[spec.suite.id].appendChild(specDiv); -}; - -jasmine.TrivialReporter.prototype.log = function() { - var console = jasmine.getGlobal().console; - if (console && console.log) { - if (console.log.apply) { - console.log.apply(console, arguments); - } else { - console.log(arguments); // ie fix: console.log.apply doesn't exist on ie - } - } -}; - -jasmine.TrivialReporter.prototype.getLocation = function() { - return this.document.location; -}; - -jasmine.TrivialReporter.prototype.specFilter = function(spec) { - var paramMap = {}; - var params = this.getLocation().search.substring(1).split('&'); - for (var i = 0; i < params.length; i++) { - var p = params[i].split('='); - paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); - } - - if (!paramMap.spec) { - return true; - } - return spec.getFullName().indexOf(paramMap.spec) === 0; -}; diff --git a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.css b/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.css deleted file mode 100644 index 8c008dc722..0000000000 --- a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.css +++ /dev/null @@ -1,82 +0,0 @@ -body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; } - -#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; } -#HTMLReporter a { text-decoration: none; } -#HTMLReporter a:hover { text-decoration: underline; } -#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; } -#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; } -#HTMLReporter #jasmine_content { position: fixed; right: 100%; } -#HTMLReporter .version { color: #aaaaaa; } -#HTMLReporter .banner { margin-top: 14px; } -#HTMLReporter .duration { color: #aaaaaa; float: right; } -#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; } -#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; } -#HTMLReporter .symbolSummary li.passed { font-size: 14px; } -#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; } -#HTMLReporter .symbolSummary li.failed { line-height: 9px; } -#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; } -#HTMLReporter .symbolSummary li.skipped { font-size: 14px; } -#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; } -#HTMLReporter .symbolSummary li.pending { line-height: 11px; } -#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; } -#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; } -#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; } -#HTMLReporter .runningAlert { background-color: #666666; } -#HTMLReporter .skippedAlert { background-color: #aaaaaa; } -#HTMLReporter .skippedAlert:first-child { background-color: #333333; } -#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; } -#HTMLReporter .passingAlert { background-color: #a6b779; } -#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; } -#HTMLReporter .failingAlert { background-color: #cf867e; } -#HTMLReporter .failingAlert:first-child { background-color: #b03911; } -#HTMLReporter .results { margin-top: 14px; } -#HTMLReporter #details { display: none; } -#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; } -#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; } -#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; } -#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; } -#HTMLReporter.showDetails .summary { display: none; } -#HTMLReporter.showDetails #details { display: block; } -#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; } -#HTMLReporter .summary { margin-top: 14px; } -#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; } -#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; } -#HTMLReporter .summary .specSummary.failed a { color: #b03911; } -#HTMLReporter .description + .suite { margin-top: 0; } -#HTMLReporter .suite { margin-top: 14px; } -#HTMLReporter .suite a { color: #333333; } -#HTMLReporter #details .specDetail { margin-bottom: 28px; } -#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; } -#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; } -#HTMLReporter .resultMessage span.result { display: block; } -#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; } - -#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ } -#TrivialReporter a:visited, #TrivialReporter a { color: #303; } -#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; } -#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; } -#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; } -#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; } -#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; } -#TrivialReporter .runner.running { background-color: yellow; } -#TrivialReporter .options { text-align: right; font-size: .8em; } -#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; } -#TrivialReporter .suite .suite { margin: 5px; } -#TrivialReporter .suite.passed { background-color: #dfd; } -#TrivialReporter .suite.failed { background-color: #fdd; } -#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; } -#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; } -#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; } -#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; } -#TrivialReporter .spec.skipped { background-color: #bbb; } -#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; } -#TrivialReporter .passed { background-color: #cfc; display: none; } -#TrivialReporter .failed { background-color: #fbb; } -#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; } -#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; } -#TrivialReporter .resultMessage .mismatch { color: black; } -#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; } -#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; } -#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; } -#TrivialReporter #jasmine_content { position: fixed; right: 100%; } -#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; } diff --git a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js b/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js deleted file mode 100644 index 6b3459b913..0000000000 --- a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js +++ /dev/null @@ -1,2600 +0,0 @@ -var isCommonJS = typeof window == "undefined" && typeof exports == "object"; - -/** - * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework. - * - * @namespace - */ -var jasmine = {}; -if (isCommonJS) exports.jasmine = jasmine; -/** - * @private - */ -jasmine.unimplementedMethod_ = function() { - throw new Error("unimplemented method"); -}; - -/** - * Use jasmine.undefined instead of undefined, since undefined is just - * a plain old variable and may be redefined by somebody else. - * - * @private - */ -jasmine.undefined = jasmine.___undefined___; - -/** - * Show diagnostic messages in the console if set to true - * - */ -jasmine.VERBOSE = false; - -/** - * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed. - * - */ -jasmine.DEFAULT_UPDATE_INTERVAL = 250; - -/** - * Maximum levels of nesting that will be included when an object is pretty-printed - */ -jasmine.MAX_PRETTY_PRINT_DEPTH = 40; - -/** - * Default timeout interval in milliseconds for waitsFor() blocks. - */ -jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000; - -/** - * By default exceptions thrown in the context of a test are caught by jasmine so that it can run the remaining tests in the suite. - * Set to false to let the exception bubble up in the browser. - * - */ -jasmine.CATCH_EXCEPTIONS = true; - -jasmine.getGlobal = function() { - function getGlobal() { - return this; - } - - return getGlobal(); -}; - -/** - * Allows for bound functions to be compared. Internal use only. - * - * @ignore - * @private - * @param base {Object} bound 'this' for the function - * @param name {Function} function to find - */ -jasmine.bindOriginal_ = function(base, name) { - var original = base[name]; - if (original.apply) { - return function() { - return original.apply(base, arguments); - }; - } else { - // IE support - return jasmine.getGlobal()[name]; - } -}; - -jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout'); -jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout'); -jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval'); -jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval'); - -jasmine.MessageResult = function(values) { - this.type = 'log'; - this.values = values; - this.trace = new Error(); // todo: test better -}; - -jasmine.MessageResult.prototype.toString = function() { - var text = ""; - for (var i = 0; i < this.values.length; i++) { - if (i > 0) text += " "; - if (jasmine.isString_(this.values[i])) { - text += this.values[i]; - } else { - text += jasmine.pp(this.values[i]); - } - } - return text; -}; - -jasmine.ExpectationResult = function(params) { - this.type = 'expect'; - this.matcherName = params.matcherName; - this.passed_ = params.passed; - this.expected = params.expected; - this.actual = params.actual; - this.message = this.passed_ ? 'Passed.' : params.message; - - var trace = (params.trace || new Error(this.message)); - this.trace = this.passed_ ? '' : trace; -}; - -jasmine.ExpectationResult.prototype.toString = function () { - return this.message; -}; - -jasmine.ExpectationResult.prototype.passed = function () { - return this.passed_; -}; - -/** - * Getter for the Jasmine environment. Ensures one gets created - */ -jasmine.getEnv = function() { - var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env(); - return env; -}; - -/** - * @ignore - * @private - * @param value - * @returns {Boolean} - */ -jasmine.isArray_ = function(value) { - return jasmine.isA_("Array", value); -}; - -/** - * @ignore - * @private - * @param value - * @returns {Boolean} - */ -jasmine.isString_ = function(value) { - return jasmine.isA_("String", value); -}; - -/** - * @ignore - * @private - * @param value - * @returns {Boolean} - */ -jasmine.isNumber_ = function(value) { - return jasmine.isA_("Number", value); -}; - -/** - * @ignore - * @private - * @param {String} typeName - * @param value - * @returns {Boolean} - */ -jasmine.isA_ = function(typeName, value) { - return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; -}; - -/** - * Pretty printer for expecations. Takes any object and turns it into a human-readable string. - * - * @param value {Object} an object to be outputted - * @returns {String} - */ -jasmine.pp = function(value) { - var stringPrettyPrinter = new jasmine.StringPrettyPrinter(); - stringPrettyPrinter.format(value); - return stringPrettyPrinter.string; -}; - -/** - * Returns true if the object is a DOM Node. - * - * @param {Object} obj object to check - * @returns {Boolean} - */ -jasmine.isDomNode = function(obj) { - return obj.nodeType > 0; -}; - -/** - * Returns a matchable 'generic' object of the class type. For use in expecations of type when values don't matter. - * - * @example - * // don't care about which function is passed in, as long as it's a function - * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function)); - * - * @param {Class} clazz - * @returns matchable object of the type clazz - */ -jasmine.any = function(clazz) { - return new jasmine.Matchers.Any(clazz); -}; - -/** - * Returns a matchable subset of a JSON object. For use in expectations when you don't care about all of the - * attributes on the object. - * - * @example - * // don't care about any other attributes than foo. - * expect(mySpy).toHaveBeenCalledWith(jasmine.objectContaining({foo: "bar"}); - * - * @param sample {Object} sample - * @returns matchable object for the sample - */ -jasmine.objectContaining = function (sample) { - return new jasmine.Matchers.ObjectContaining(sample); -}; - -/** - * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks. - * - * Spies should be created in test setup, before expectations. They can then be checked, using the standard Jasmine - * expectation syntax. Spies can be checked if they were called or not and what the calling params were. - * - * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs). - * - * Spies are torn down at the end of every spec. - * - * Note: Do not call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj. - * - * @example - * // a stub - * var myStub = jasmine.createSpy('myStub'); // can be used anywhere - * - * // spy example - * var foo = { - * not: function(bool) { return !bool; } - * } - * - * // actual foo.not will not be called, execution stops - * spyOn(foo, 'not'); - - // foo.not spied upon, execution will continue to implementation - * spyOn(foo, 'not').andCallThrough(); - * - * // fake example - * var foo = { - * not: function(bool) { return !bool; } - * } - * - * // foo.not(val) will return val - * spyOn(foo, 'not').andCallFake(function(value) {return value;}); - * - * // mock example - * foo.not(7 == 7); - * expect(foo.not).toHaveBeenCalled(); - * expect(foo.not).toHaveBeenCalledWith(true); - * - * @constructor - * @see spyOn, jasmine.createSpy, jasmine.createSpyObj - * @param {String} name - */ -jasmine.Spy = function(name) { - /** - * The name of the spy, if provided. - */ - this.identity = name || 'unknown'; - /** - * Is this Object a spy? - */ - this.isSpy = true; - /** - * The actual function this spy stubs. - */ - this.plan = function() { - }; - /** - * Tracking of the most recent call to the spy. - * @example - * var mySpy = jasmine.createSpy('foo'); - * mySpy(1, 2); - * mySpy.mostRecentCall.args = [1, 2]; - */ - this.mostRecentCall = {}; - - /** - * Holds arguments for each call to the spy, indexed by call count - * @example - * var mySpy = jasmine.createSpy('foo'); - * mySpy(1, 2); - * mySpy(7, 8); - * mySpy.mostRecentCall.args = [7, 8]; - * mySpy.argsForCall[0] = [1, 2]; - * mySpy.argsForCall[1] = [7, 8]; - */ - this.argsForCall = []; - this.calls = []; -}; - -/** - * Tells a spy to call through to the actual implemenatation. - * - * @example - * var foo = { - * bar: function() { // do some stuff } - * } - * - * // defining a spy on an existing property: foo.bar - * spyOn(foo, 'bar').andCallThrough(); - */ -jasmine.Spy.prototype.andCallThrough = function() { - this.plan = this.originalValue; - return this; -}; - -/** - * For setting the return value of a spy. - * - * @example - * // defining a spy from scratch: foo() returns 'baz' - * var foo = jasmine.createSpy('spy on foo').andReturn('baz'); - * - * // defining a spy on an existing property: foo.bar() returns 'baz' - * spyOn(foo, 'bar').andReturn('baz'); - * - * @param {Object} value - */ -jasmine.Spy.prototype.andReturn = function(value) { - this.plan = function() { - return value; - }; - return this; -}; - -/** - * For throwing an exception when a spy is called. - * - * @example - * // defining a spy from scratch: foo() throws an exception w/ message 'ouch' - * var foo = jasmine.createSpy('spy on foo').andThrow('baz'); - * - * // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch' - * spyOn(foo, 'bar').andThrow('baz'); - * - * @param {String} exceptionMsg - */ -jasmine.Spy.prototype.andThrow = function(exceptionMsg) { - this.plan = function() { - throw exceptionMsg; - }; - return this; -}; - -/** - * Calls an alternate implementation when a spy is called. - * - * @example - * var baz = function() { - * // do some stuff, return something - * } - * // defining a spy from scratch: foo() calls the function baz - * var foo = jasmine.createSpy('spy on foo').andCall(baz); - * - * // defining a spy on an existing property: foo.bar() calls an anonymnous function - * spyOn(foo, 'bar').andCall(function() { return 'baz';} ); - * - * @param {Function} fakeFunc - */ -jasmine.Spy.prototype.andCallFake = function(fakeFunc) { - this.plan = fakeFunc; - return this; -}; - -/** - * Resets all of a spy's the tracking variables so that it can be used again. - * - * @example - * spyOn(foo, 'bar'); - * - * foo.bar(); - * - * expect(foo.bar.callCount).toEqual(1); - * - * foo.bar.reset(); - * - * expect(foo.bar.callCount).toEqual(0); - */ -jasmine.Spy.prototype.reset = function() { - this.wasCalled = false; - this.callCount = 0; - this.argsForCall = []; - this.calls = []; - this.mostRecentCall = {}; -}; - -jasmine.createSpy = function(name) { - - var spyObj = function() { - spyObj.wasCalled = true; - spyObj.callCount++; - var args = jasmine.util.argsToArray(arguments); - spyObj.mostRecentCall.object = this; - spyObj.mostRecentCall.args = args; - spyObj.argsForCall.push(args); - spyObj.calls.push({object: this, args: args}); - return spyObj.plan.apply(this, arguments); - }; - - var spy = new jasmine.Spy(name); - - for (var prop in spy) { - spyObj[prop] = spy[prop]; - } - - spyObj.reset(); - - return spyObj; -}; - -/** - * Determines whether an object is a spy. - * - * @param {jasmine.Spy|Object} putativeSpy - * @returns {Boolean} - */ -jasmine.isSpy = function(putativeSpy) { - return putativeSpy && putativeSpy.isSpy; -}; - -/** - * Creates a more complicated spy: an Object that has every property a function that is a spy. Used for stubbing something - * large in one call. - * - * @param {String} baseName name of spy class - * @param {Array} methodNames array of names of methods to make spies - */ -jasmine.createSpyObj = function(baseName, methodNames) { - if (!jasmine.isArray_(methodNames) || methodNames.length === 0) { - throw new Error('createSpyObj requires a non-empty array of method names to create spies for'); - } - var obj = {}; - for (var i = 0; i < methodNames.length; i++) { - obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]); - } - return obj; -}; - -/** - * All parameters are pretty-printed and concatenated together, then written to the current spec's output. - * - * Be careful not to leave calls to jasmine.log in production code. - */ -jasmine.log = function() { - var spec = jasmine.getEnv().currentSpec; - spec.log.apply(spec, arguments); -}; - -/** - * Function that installs a spy on an existing object's method name. Used within a Spec to create a spy. - * - * @example - * // spy example - * var foo = { - * not: function(bool) { return !bool; } - * } - * spyOn(foo, 'not'); // actual foo.not will not be called, execution stops - * - * @see jasmine.createSpy - * @param obj - * @param methodName - * @return {jasmine.Spy} a Jasmine spy that can be chained with all spy methods - */ -var spyOn = function(obj, methodName) { - return jasmine.getEnv().currentSpec.spyOn(obj, methodName); -}; -if (isCommonJS) exports.spyOn = spyOn; - -/** - * Creates a Jasmine spec that will be added to the current suite. - * - * // TODO: pending tests - * - * @example - * it('should be true', function() { - * expect(true).toEqual(true); - * }); - * - * @param {String} desc description of this specification - * @param {Function} func defines the preconditions and expectations of the spec - */ -var it = function(desc, func) { - return jasmine.getEnv().it(desc, func); -}; -if (isCommonJS) exports.it = it; - -/** - * Creates a disabled Jasmine spec. - * - * A convenience method that allows existing specs to be disabled temporarily during development. - * - * @param {String} desc description of this specification - * @param {Function} func defines the preconditions and expectations of the spec - */ -var xit = function(desc, func) { - return jasmine.getEnv().xit(desc, func); -}; -if (isCommonJS) exports.xit = xit; - -/** - * Starts a chain for a Jasmine expectation. - * - * It is passed an Object that is the actual value and should chain to one of the many - * jasmine.Matchers functions. - * - * @param {Object} actual Actual value to test against and expected value - * @return {jasmine.Matchers} - */ -var expect = function(actual) { - return jasmine.getEnv().currentSpec.expect(actual); -}; -if (isCommonJS) exports.expect = expect; - -/** - * Defines part of a jasmine spec. Used in cominbination with waits or waitsFor in asynchrnous specs. - * - * @param {Function} func Function that defines part of a jasmine spec. - */ -var runs = function(func) { - jasmine.getEnv().currentSpec.runs(func); -}; -if (isCommonJS) exports.runs = runs; - -/** - * Waits a fixed time period before moving to the next block. - * - * @deprecated Use waitsFor() instead - * @param {Number} timeout milliseconds to wait - */ -var waits = function(timeout) { - jasmine.getEnv().currentSpec.waits(timeout); -}; -if (isCommonJS) exports.waits = waits; - -/** - * Waits for the latchFunction to return true before proceeding to the next block. - * - * @param {Function} latchFunction - * @param {String} optional_timeoutMessage - * @param {Number} optional_timeout - */ -var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { - jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments); -}; -if (isCommonJS) exports.waitsFor = waitsFor; - -/** - * A function that is called before each spec in a suite. - * - * Used for spec setup, including validating assumptions. - * - * @param {Function} beforeEachFunction - */ -var beforeEach = function(beforeEachFunction) { - jasmine.getEnv().beforeEach(beforeEachFunction); -}; -if (isCommonJS) exports.beforeEach = beforeEach; - -/** - * A function that is called after each spec in a suite. - * - * Used for restoring any state that is hijacked during spec execution. - * - * @param {Function} afterEachFunction - */ -var afterEach = function(afterEachFunction) { - jasmine.getEnv().afterEach(afterEachFunction); -}; -if (isCommonJS) exports.afterEach = afterEach; - -/** - * Defines a suite of specifications. - * - * Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared - * are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization - * of setup in some tests. - * - * @example - * // TODO: a simple suite - * - * // TODO: a simple suite with a nested describe block - * - * @param {String} description A string, usually the class under test. - * @param {Function} specDefinitions function that defines several specs. - */ -var describe = function(description, specDefinitions) { - return jasmine.getEnv().describe(description, specDefinitions); -}; -if (isCommonJS) exports.describe = describe; - -/** - * Disables a suite of specifications. Used to disable some suites in a file, or files, temporarily during development. - * - * @param {String} description A string, usually the class under test. - * @param {Function} specDefinitions function that defines several specs. - */ -var xdescribe = function(description, specDefinitions) { - return jasmine.getEnv().xdescribe(description, specDefinitions); -}; -if (isCommonJS) exports.xdescribe = xdescribe; - - -// Provide the XMLHttpRequest class for IE 5.x-6.x: -jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() { - function tryIt(f) { - try { - return f(); - } catch(e) { - } - return null; - } - - var xhr = tryIt(function() { - return new ActiveXObject("Msxml2.XMLHTTP.6.0"); - }) || - tryIt(function() { - return new ActiveXObject("Msxml2.XMLHTTP.3.0"); - }) || - tryIt(function() { - return new ActiveXObject("Msxml2.XMLHTTP"); - }) || - tryIt(function() { - return new ActiveXObject("Microsoft.XMLHTTP"); - }); - - if (!xhr) throw new Error("This browser does not support XMLHttpRequest."); - - return xhr; -} : XMLHttpRequest; -/** - * @namespace - */ -jasmine.util = {}; - -/** - * Declare that a child class inherit it's prototype from the parent class. - * - * @private - * @param {Function} childClass - * @param {Function} parentClass - */ -jasmine.util.inherit = function(childClass, parentClass) { - /** - * @private - */ - var subclass = function() { - }; - subclass.prototype = parentClass.prototype; - childClass.prototype = new subclass(); -}; - -jasmine.util.formatException = function(e) { - var lineNumber; - if (e.line) { - lineNumber = e.line; - } - else if (e.lineNumber) { - lineNumber = e.lineNumber; - } - - var file; - - if (e.sourceURL) { - file = e.sourceURL; - } - else if (e.fileName) { - file = e.fileName; - } - - var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString(); - - if (file && lineNumber) { - message += ' in ' + file + ' (line ' + lineNumber + ')'; - } - - return message; -}; - -jasmine.util.htmlEscape = function(str) { - if (!str) return str; - return str.replace(/&/g, '&') - .replace(//g, '>'); -}; - -jasmine.util.argsToArray = function(args) { - var arrayOfArgs = []; - for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]); - return arrayOfArgs; -}; - -jasmine.util.extend = function(destination, source) { - for (var property in source) destination[property] = source[property]; - return destination; -}; - -/** - * Environment for Jasmine - * - * @constructor - */ -jasmine.Env = function() { - this.currentSpec = null; - this.currentSuite = null; - this.currentRunner_ = new jasmine.Runner(this); - - this.reporter = new jasmine.MultiReporter(); - - this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL; - this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL; - this.lastUpdate = 0; - this.specFilter = function() { - return true; - }; - - this.nextSpecId_ = 0; - this.nextSuiteId_ = 0; - this.equalityTesters_ = []; - - // wrap matchers - this.matchersClass = function() { - jasmine.Matchers.apply(this, arguments); - }; - jasmine.util.inherit(this.matchersClass, jasmine.Matchers); - - jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass); -}; - - -jasmine.Env.prototype.setTimeout = jasmine.setTimeout; -jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout; -jasmine.Env.prototype.setInterval = jasmine.setInterval; -jasmine.Env.prototype.clearInterval = jasmine.clearInterval; - -/** - * @returns an object containing jasmine version build info, if set. - */ -jasmine.Env.prototype.version = function () { - if (jasmine.version_) { - return jasmine.version_; - } else { - throw new Error('Version not set'); - } -}; - -/** - * @returns string containing jasmine version build info, if set. - */ -jasmine.Env.prototype.versionString = function() { - if (!jasmine.version_) { - return "version unknown"; - } - - var version = this.version(); - var versionString = version.major + "." + version.minor + "." + version.build; - if (version.release_candidate) { - versionString += ".rc" + version.release_candidate; - } - versionString += " revision " + version.revision; - return versionString; -}; - -/** - * @returns a sequential integer starting at 0 - */ -jasmine.Env.prototype.nextSpecId = function () { - return this.nextSpecId_++; -}; - -/** - * @returns a sequential integer starting at 0 - */ -jasmine.Env.prototype.nextSuiteId = function () { - return this.nextSuiteId_++; -}; - -/** - * Register a reporter to receive status updates from Jasmine. - * @param {jasmine.Reporter} reporter An object which will receive status updates. - */ -jasmine.Env.prototype.addReporter = function(reporter) { - this.reporter.addReporter(reporter); -}; - -jasmine.Env.prototype.execute = function() { - this.currentRunner_.execute(); -}; - -jasmine.Env.prototype.describe = function(description, specDefinitions) { - var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite); - - var parentSuite = this.currentSuite; - if (parentSuite) { - parentSuite.add(suite); - } else { - this.currentRunner_.add(suite); - } - - this.currentSuite = suite; - - var declarationError = null; - try { - specDefinitions.call(suite); - } catch(e) { - declarationError = e; - } - - if (declarationError) { - this.it("encountered a declaration exception", function() { - throw declarationError; - }); - } - - this.currentSuite = parentSuite; - - return suite; -}; - -jasmine.Env.prototype.beforeEach = function(beforeEachFunction) { - if (this.currentSuite) { - this.currentSuite.beforeEach(beforeEachFunction); - } else { - this.currentRunner_.beforeEach(beforeEachFunction); - } -}; - -jasmine.Env.prototype.currentRunner = function () { - return this.currentRunner_; -}; - -jasmine.Env.prototype.afterEach = function(afterEachFunction) { - if (this.currentSuite) { - this.currentSuite.afterEach(afterEachFunction); - } else { - this.currentRunner_.afterEach(afterEachFunction); - } - -}; - -jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) { - return { - execute: function() { - } - }; -}; - -jasmine.Env.prototype.it = function(description, func) { - var spec = new jasmine.Spec(this, this.currentSuite, description); - this.currentSuite.add(spec); - this.currentSpec = spec; - - if (func) { - spec.runs(func); - } - - return spec; -}; - -jasmine.Env.prototype.xit = function(desc, func) { - return { - id: this.nextSpecId(), - runs: function() { - } - }; -}; - -jasmine.Env.prototype.compareRegExps_ = function(a, b, mismatchKeys, mismatchValues) { - if (a.source != b.source) - mismatchValues.push("expected pattern /" + b.source + "/ is not equal to the pattern /" + a.source + "/"); - - if (a.ignoreCase != b.ignoreCase) - mismatchValues.push("expected modifier i was" + (b.ignoreCase ? " " : " not ") + "set and does not equal the origin modifier"); - - if (a.global != b.global) - mismatchValues.push("expected modifier g was" + (b.global ? " " : " not ") + "set and does not equal the origin modifier"); - - if (a.multiline != b.multiline) - mismatchValues.push("expected modifier m was" + (b.multiline ? " " : " not ") + "set and does not equal the origin modifier"); - - if (a.sticky != b.sticky) - mismatchValues.push("expected modifier y was" + (b.sticky ? " " : " not ") + "set and does not equal the origin modifier"); - - return (mismatchValues.length === 0); -}; - -jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) { - if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) { - return true; - } - - a.__Jasmine_been_here_before__ = b; - b.__Jasmine_been_here_before__ = a; - - var hasKey = function(obj, keyName) { - return obj !== null && obj[keyName] !== jasmine.undefined; - }; - - for (var property in b) { - if (!hasKey(a, property) && hasKey(b, property)) { - mismatchKeys.push("expected has key '" + property + "', but missing from actual."); - } - } - for (property in a) { - if (!hasKey(b, property) && hasKey(a, property)) { - mismatchKeys.push("expected missing key '" + property + "', but present in actual."); - } - } - for (property in b) { - if (property == '__Jasmine_been_here_before__') continue; - if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) { - mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual."); - } - } - - if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) { - mismatchValues.push("arrays were not the same length"); - } - - delete a.__Jasmine_been_here_before__; - delete b.__Jasmine_been_here_before__; - return (mismatchKeys.length === 0 && mismatchValues.length === 0); -}; - -jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) { - mismatchKeys = mismatchKeys || []; - mismatchValues = mismatchValues || []; - - for (var i = 0; i < this.equalityTesters_.length; i++) { - var equalityTester = this.equalityTesters_[i]; - var result = equalityTester(a, b, this, mismatchKeys, mismatchValues); - if (result !== jasmine.undefined) return result; - } - - if (a === b) return true; - - if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) { - return (a == jasmine.undefined && b == jasmine.undefined); - } - - if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) { - return a === b; - } - - if (a instanceof Date && b instanceof Date) { - return a.getTime() == b.getTime(); - } - - if (a.jasmineMatches) { - return a.jasmineMatches(b); - } - - if (b.jasmineMatches) { - return b.jasmineMatches(a); - } - - if (a instanceof jasmine.Matchers.ObjectContaining) { - return a.matches(b); - } - - if (b instanceof jasmine.Matchers.ObjectContaining) { - return b.matches(a); - } - - if (jasmine.isString_(a) && jasmine.isString_(b)) { - return (a == b); - } - - if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) { - return (a == b); - } - - if (a instanceof RegExp && b instanceof RegExp) { - return this.compareRegExps_(a, b, mismatchKeys, mismatchValues); - } - - if (typeof a === "object" && typeof b === "object") { - return this.compareObjects_(a, b, mismatchKeys, mismatchValues); - } - - //Straight check - return (a === b); -}; - -jasmine.Env.prototype.contains_ = function(haystack, needle) { - if (jasmine.isArray_(haystack)) { - for (var i = 0; i < haystack.length; i++) { - if (this.equals_(haystack[i], needle)) return true; - } - return false; - } - return haystack.indexOf(needle) >= 0; -}; - -jasmine.Env.prototype.addEqualityTester = function(equalityTester) { - this.equalityTesters_.push(equalityTester); -}; -/** No-op base class for Jasmine reporters. - * - * @constructor - */ -jasmine.Reporter = function() { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportRunnerStarting = function(runner) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportRunnerResults = function(runner) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSuiteResults = function(suite) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSpecStarting = function(spec) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSpecResults = function(spec) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.log = function(str) { -}; - -/** - * Blocks are functions with executable code that make up a spec. - * - * @constructor - * @param {jasmine.Env} env - * @param {Function} func - * @param {jasmine.Spec} spec - */ -jasmine.Block = function(env, func, spec) { - this.env = env; - this.func = func; - this.spec = spec; -}; - -jasmine.Block.prototype.execute = function(onComplete) { - if (!jasmine.CATCH_EXCEPTIONS) { - this.func.apply(this.spec); - } - else { - try { - this.func.apply(this.spec); - } catch (e) { - this.spec.fail(e); - } - } - onComplete(); -}; -/** JavaScript API reporter. - * - * @constructor - */ -jasmine.JsApiReporter = function() { - this.started = false; - this.finished = false; - this.suites_ = []; - this.results_ = {}; -}; - -jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) { - this.started = true; - var suites = runner.topLevelSuites(); - for (var i = 0; i < suites.length; i++) { - var suite = suites[i]; - this.suites_.push(this.summarize_(suite)); - } -}; - -jasmine.JsApiReporter.prototype.suites = function() { - return this.suites_; -}; - -jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) { - var isSuite = suiteOrSpec instanceof jasmine.Suite; - var summary = { - id: suiteOrSpec.id, - name: suiteOrSpec.description, - type: isSuite ? 'suite' : 'spec', - children: [] - }; - - if (isSuite) { - var children = suiteOrSpec.children(); - for (var i = 0; i < children.length; i++) { - summary.children.push(this.summarize_(children[i])); - } - } - return summary; -}; - -jasmine.JsApiReporter.prototype.results = function() { - return this.results_; -}; - -jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) { - return this.results_[specId]; -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) { - this.finished = true; -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) { - this.results_[spec.id] = { - messages: spec.results().getItems(), - result: spec.results().failedCount > 0 ? "failed" : "passed" - }; -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.log = function(str) { -}; - -jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){ - var results = {}; - for (var i = 0; i < specIds.length; i++) { - var specId = specIds[i]; - results[specId] = this.summarizeResult_(this.results_[specId]); - } - return results; -}; - -jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){ - var summaryMessages = []; - var messagesLength = result.messages.length; - for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) { - var resultMessage = result.messages[messageIndex]; - summaryMessages.push({ - text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined, - passed: resultMessage.passed ? resultMessage.passed() : true, - type: resultMessage.type, - message: resultMessage.message, - trace: { - stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined - } - }); - } - - return { - result : result.result, - messages : summaryMessages - }; -}; - -/** - * @constructor - * @param {jasmine.Env} env - * @param actual - * @param {jasmine.Spec} spec - */ -jasmine.Matchers = function(env, actual, spec, opt_isNot) { - this.env = env; - this.actual = actual; - this.spec = spec; - this.isNot = opt_isNot || false; - this.reportWasCalled_ = false; -}; - -// todo: @deprecated as of Jasmine 0.11, remove soon [xw] -jasmine.Matchers.pp = function(str) { - throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); -}; - -// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw] -jasmine.Matchers.prototype.report = function(result, failing_message, details) { - throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); -}; - -jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) { - for (var methodName in prototype) { - if (methodName == 'report') continue; - var orig = prototype[methodName]; - matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig); - } -}; - -jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) { - return function() { - var matcherArgs = jasmine.util.argsToArray(arguments); - var result = matcherFunction.apply(this, arguments); - - if (this.isNot) { - result = !result; - } - - if (this.reportWasCalled_) return result; - - var message; - if (!result) { - if (this.message) { - message = this.message.apply(this, arguments); - if (jasmine.isArray_(message)) { - message = message[this.isNot ? 1 : 0]; - } - } else { - var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); - message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate; - if (matcherArgs.length > 0) { - for (var i = 0; i < matcherArgs.length; i++) { - if (i > 0) message += ","; - message += " " + jasmine.pp(matcherArgs[i]); - } - } - message += "."; - } - } - var expectationResult = new jasmine.ExpectationResult({ - matcherName: matcherName, - passed: result, - expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0], - actual: this.actual, - message: message - }); - this.spec.addMatcherResult(expectationResult); - return jasmine.undefined; - }; -}; - - - - -/** - * toBe: compares the actual to the expected using === - * @param expected - */ -jasmine.Matchers.prototype.toBe = function(expected) { - return this.actual === expected; -}; - -/** - * toNotBe: compares the actual to the expected using !== - * @param expected - * @deprecated as of 1.0. Use not.toBe() instead. - */ -jasmine.Matchers.prototype.toNotBe = function(expected) { - return this.actual !== expected; -}; - -/** - * toEqual: compares the actual to the expected using common sense equality. Handles Objects, Arrays, etc. - * - * @param expected - */ -jasmine.Matchers.prototype.toEqual = function(expected) { - return this.env.equals_(this.actual, expected); -}; - -/** - * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual - * @param expected - * @deprecated as of 1.0. Use not.toEqual() instead. - */ -jasmine.Matchers.prototype.toNotEqual = function(expected) { - return !this.env.equals_(this.actual, expected); -}; - -/** - * Matcher that compares the actual to the expected using a regular expression. Constructs a RegExp, so takes - * a pattern or a String. - * - * @param expected - */ -jasmine.Matchers.prototype.toMatch = function(expected) { - return new RegExp(expected).test(this.actual); -}; - -/** - * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch - * @param expected - * @deprecated as of 1.0. Use not.toMatch() instead. - */ -jasmine.Matchers.prototype.toNotMatch = function(expected) { - return !(new RegExp(expected).test(this.actual)); -}; - -/** - * Matcher that compares the actual to jasmine.undefined. - */ -jasmine.Matchers.prototype.toBeDefined = function() { - return (this.actual !== jasmine.undefined); -}; - -/** - * Matcher that compares the actual to jasmine.undefined. - */ -jasmine.Matchers.prototype.toBeUndefined = function() { - return (this.actual === jasmine.undefined); -}; - -/** - * Matcher that compares the actual to null. - */ -jasmine.Matchers.prototype.toBeNull = function() { - return (this.actual === null); -}; - -/** - * Matcher that compares the actual to NaN. - */ -jasmine.Matchers.prototype.toBeNaN = function() { - this.message = function() { - return [ "Expected " + jasmine.pp(this.actual) + " to be NaN." ]; - }; - - return (this.actual !== this.actual); -}; - -/** - * Matcher that boolean not-nots the actual. - */ -jasmine.Matchers.prototype.toBeTruthy = function() { - return !!this.actual; -}; - - -/** - * Matcher that boolean nots the actual. - */ -jasmine.Matchers.prototype.toBeFalsy = function() { - return !this.actual; -}; - - -/** - * Matcher that checks to see if the actual, a Jasmine spy, was called. - */ -jasmine.Matchers.prototype.toHaveBeenCalled = function() { - if (arguments.length > 0) { - throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); - } - - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function() { - return [ - "Expected spy " + this.actual.identity + " to have been called.", - "Expected spy " + this.actual.identity + " not to have been called." - ]; - }; - - return this.actual.wasCalled; -}; - -/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */ -jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled; - -/** - * Matcher that checks to see if the actual, a Jasmine spy, was not called. - * - * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead - */ -jasmine.Matchers.prototype.wasNotCalled = function() { - if (arguments.length > 0) { - throw new Error('wasNotCalled does not take arguments'); - } - - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function() { - return [ - "Expected spy " + this.actual.identity + " to not have been called.", - "Expected spy " + this.actual.identity + " to have been called." - ]; - }; - - return !this.actual.wasCalled; -}; - -/** - * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters. - * - * @example - * - */ -jasmine.Matchers.prototype.toHaveBeenCalledWith = function() { - var expectedArgs = jasmine.util.argsToArray(arguments); - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - this.message = function() { - var invertedMessage = "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."; - var positiveMessage = ""; - if (this.actual.callCount === 0) { - positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called."; - } else { - positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but actual calls were " + jasmine.pp(this.actual.argsForCall).replace(/^\[ | \]$/g, '') - } - return [positiveMessage, invertedMessage]; - }; - - return this.env.contains_(this.actual.argsForCall, expectedArgs); -}; - -/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */ -jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith; - -/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */ -jasmine.Matchers.prototype.wasNotCalledWith = function() { - var expectedArgs = jasmine.util.argsToArray(arguments); - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function() { - return [ - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was", - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was" - ]; - }; - - return !this.env.contains_(this.actual.argsForCall, expectedArgs); -}; - -/** - * Matcher that checks that the expected item is an element in the actual Array. - * - * @param {Object} expected - */ -jasmine.Matchers.prototype.toContain = function(expected) { - return this.env.contains_(this.actual, expected); -}; - -/** - * Matcher that checks that the expected item is NOT an element in the actual Array. - * - * @param {Object} expected - * @deprecated as of 1.0. Use not.toContain() instead. - */ -jasmine.Matchers.prototype.toNotContain = function(expected) { - return !this.env.contains_(this.actual, expected); -}; - -jasmine.Matchers.prototype.toBeLessThan = function(expected) { - return this.actual < expected; -}; - -jasmine.Matchers.prototype.toBeGreaterThan = function(expected) { - return this.actual > expected; -}; - -/** - * Matcher that checks that the expected item is equal to the actual item - * up to a given level of decimal precision (default 2). - * - * @param {Number} expected - * @param {Number} precision, as number of decimal places - */ -jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) { - if (!(precision === 0)) { - precision = precision || 2; - } - return Math.abs(expected - this.actual) < (Math.pow(10, -precision) / 2); -}; - -/** - * Matcher that checks that the expected exception was thrown by the actual. - * - * @param {String} [expected] - */ -jasmine.Matchers.prototype.toThrow = function(expected) { - var result = false; - var exception; - if (typeof this.actual != 'function') { - throw new Error('Actual is not a function'); - } - try { - this.actual(); - } catch (e) { - exception = e; - } - if (exception) { - result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected)); - } - - var not = this.isNot ? "not " : ""; - - this.message = function() { - if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) { - return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' '); - } else { - return "Expected function to throw an exception."; - } - }; - - return result; -}; - -jasmine.Matchers.Any = function(expectedClass) { - this.expectedClass = expectedClass; -}; - -jasmine.Matchers.Any.prototype.jasmineMatches = function(other) { - if (this.expectedClass == String) { - return typeof other == 'string' || other instanceof String; - } - - if (this.expectedClass == Number) { - return typeof other == 'number' || other instanceof Number; - } - - if (this.expectedClass == Function) { - return typeof other == 'function' || other instanceof Function; - } - - if (this.expectedClass == Object) { - return typeof other == 'object'; - } - - return other instanceof this.expectedClass; -}; - -jasmine.Matchers.Any.prototype.jasmineToString = function() { - return ''; -}; - -jasmine.Matchers.ObjectContaining = function (sample) { - this.sample = sample; -}; - -jasmine.Matchers.ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { - mismatchKeys = mismatchKeys || []; - mismatchValues = mismatchValues || []; - - var env = jasmine.getEnv(); - - var hasKey = function(obj, keyName) { - return obj != null && obj[keyName] !== jasmine.undefined; - }; - - for (var property in this.sample) { - if (!hasKey(other, property) && hasKey(this.sample, property)) { - mismatchKeys.push("expected has key '" + property + "', but missing from actual."); - } - else if (!env.equals_(this.sample[property], other[property], mismatchKeys, mismatchValues)) { - mismatchValues.push("'" + property + "' was '" + (other[property] ? jasmine.util.htmlEscape(other[property].toString()) : other[property]) + "' in expected, but was '" + (this.sample[property] ? jasmine.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in actual."); - } - } - - return (mismatchKeys.length === 0 && mismatchValues.length === 0); -}; - -jasmine.Matchers.ObjectContaining.prototype.jasmineToString = function () { - return ""; -}; -// Mock setTimeout, clearTimeout -// Contributed by Pivotal Computer Systems, www.pivotalsf.com - -jasmine.FakeTimer = function() { - this.reset(); - - var self = this; - self.setTimeout = function(funcToCall, millis) { - self.timeoutsMade++; - self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false); - return self.timeoutsMade; - }; - - self.setInterval = function(funcToCall, millis) { - self.timeoutsMade++; - self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true); - return self.timeoutsMade; - }; - - self.clearTimeout = function(timeoutKey) { - self.scheduledFunctions[timeoutKey] = jasmine.undefined; - }; - - self.clearInterval = function(timeoutKey) { - self.scheduledFunctions[timeoutKey] = jasmine.undefined; - }; - -}; - -jasmine.FakeTimer.prototype.reset = function() { - this.timeoutsMade = 0; - this.scheduledFunctions = {}; - this.nowMillis = 0; -}; - -jasmine.FakeTimer.prototype.tick = function(millis) { - var oldMillis = this.nowMillis; - var newMillis = oldMillis + millis; - this.runFunctionsWithinRange(oldMillis, newMillis); - this.nowMillis = newMillis; -}; - -jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) { - var scheduledFunc; - var funcsToRun = []; - for (var timeoutKey in this.scheduledFunctions) { - scheduledFunc = this.scheduledFunctions[timeoutKey]; - if (scheduledFunc != jasmine.undefined && - scheduledFunc.runAtMillis >= oldMillis && - scheduledFunc.runAtMillis <= nowMillis) { - funcsToRun.push(scheduledFunc); - this.scheduledFunctions[timeoutKey] = jasmine.undefined; - } - } - - if (funcsToRun.length > 0) { - funcsToRun.sort(function(a, b) { - return a.runAtMillis - b.runAtMillis; - }); - for (var i = 0; i < funcsToRun.length; ++i) { - try { - var funcToRun = funcsToRun[i]; - this.nowMillis = funcToRun.runAtMillis; - funcToRun.funcToCall(); - if (funcToRun.recurring) { - this.scheduleFunction(funcToRun.timeoutKey, - funcToRun.funcToCall, - funcToRun.millis, - true); - } - } catch(e) { - } - } - this.runFunctionsWithinRange(oldMillis, nowMillis); - } -}; - -jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) { - this.scheduledFunctions[timeoutKey] = { - runAtMillis: this.nowMillis + millis, - funcToCall: funcToCall, - recurring: recurring, - timeoutKey: timeoutKey, - millis: millis - }; -}; - -/** - * @namespace - */ -jasmine.Clock = { - defaultFakeTimer: new jasmine.FakeTimer(), - - reset: function() { - jasmine.Clock.assertInstalled(); - jasmine.Clock.defaultFakeTimer.reset(); - }, - - tick: function(millis) { - jasmine.Clock.assertInstalled(); - jasmine.Clock.defaultFakeTimer.tick(millis); - }, - - runFunctionsWithinRange: function(oldMillis, nowMillis) { - jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis); - }, - - scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) { - jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring); - }, - - useMock: function() { - if (!jasmine.Clock.isInstalled()) { - var spec = jasmine.getEnv().currentSpec; - spec.after(jasmine.Clock.uninstallMock); - - jasmine.Clock.installMock(); - } - }, - - installMock: function() { - jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer; - }, - - uninstallMock: function() { - jasmine.Clock.assertInstalled(); - jasmine.Clock.installed = jasmine.Clock.real; - }, - - real: { - setTimeout: jasmine.getGlobal().setTimeout, - clearTimeout: jasmine.getGlobal().clearTimeout, - setInterval: jasmine.getGlobal().setInterval, - clearInterval: jasmine.getGlobal().clearInterval - }, - - assertInstalled: function() { - if (!jasmine.Clock.isInstalled()) { - throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()"); - } - }, - - isInstalled: function() { - return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer; - }, - - installed: null -}; -jasmine.Clock.installed = jasmine.Clock.real; - -//else for IE support -jasmine.getGlobal().setTimeout = function(funcToCall, millis) { - if (jasmine.Clock.installed.setTimeout.apply) { - return jasmine.Clock.installed.setTimeout.apply(this, arguments); - } else { - return jasmine.Clock.installed.setTimeout(funcToCall, millis); - } -}; - -jasmine.getGlobal().setInterval = function(funcToCall, millis) { - if (jasmine.Clock.installed.setInterval.apply) { - return jasmine.Clock.installed.setInterval.apply(this, arguments); - } else { - return jasmine.Clock.installed.setInterval(funcToCall, millis); - } -}; - -jasmine.getGlobal().clearTimeout = function(timeoutKey) { - if (jasmine.Clock.installed.clearTimeout.apply) { - return jasmine.Clock.installed.clearTimeout.apply(this, arguments); - } else { - return jasmine.Clock.installed.clearTimeout(timeoutKey); - } -}; - -jasmine.getGlobal().clearInterval = function(timeoutKey) { - if (jasmine.Clock.installed.clearTimeout.apply) { - return jasmine.Clock.installed.clearInterval.apply(this, arguments); - } else { - return jasmine.Clock.installed.clearInterval(timeoutKey); - } -}; - -/** - * @constructor - */ -jasmine.MultiReporter = function() { - this.subReporters_ = []; -}; -jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter); - -jasmine.MultiReporter.prototype.addReporter = function(reporter) { - this.subReporters_.push(reporter); -}; - -(function() { - var functionNames = [ - "reportRunnerStarting", - "reportRunnerResults", - "reportSuiteResults", - "reportSpecStarting", - "reportSpecResults", - "log" - ]; - for (var i = 0; i < functionNames.length; i++) { - var functionName = functionNames[i]; - jasmine.MultiReporter.prototype[functionName] = (function(functionName) { - return function() { - for (var j = 0; j < this.subReporters_.length; j++) { - var subReporter = this.subReporters_[j]; - if (subReporter[functionName]) { - subReporter[functionName].apply(subReporter, arguments); - } - } - }; - })(functionName); - } -})(); -/** - * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults - * - * @constructor - */ -jasmine.NestedResults = function() { - /** - * The total count of results - */ - this.totalCount = 0; - /** - * Number of passed results - */ - this.passedCount = 0; - /** - * Number of failed results - */ - this.failedCount = 0; - /** - * Was this suite/spec skipped? - */ - this.skipped = false; - /** - * @ignore - */ - this.items_ = []; -}; - -/** - * Roll up the result counts. - * - * @param result - */ -jasmine.NestedResults.prototype.rollupCounts = function(result) { - this.totalCount += result.totalCount; - this.passedCount += result.passedCount; - this.failedCount += result.failedCount; -}; - -/** - * Adds a log message. - * @param values Array of message parts which will be concatenated later. - */ -jasmine.NestedResults.prototype.log = function(values) { - this.items_.push(new jasmine.MessageResult(values)); -}; - -/** - * Getter for the results: message & results. - */ -jasmine.NestedResults.prototype.getItems = function() { - return this.items_; -}; - -/** - * Adds a result, tracking counts (total, passed, & failed) - * @param {jasmine.ExpectationResult|jasmine.NestedResults} result - */ -jasmine.NestedResults.prototype.addResult = function(result) { - if (result.type != 'log') { - if (result.items_) { - this.rollupCounts(result); - } else { - this.totalCount++; - if (result.passed()) { - this.passedCount++; - } else { - this.failedCount++; - } - } - } - this.items_.push(result); -}; - -/** - * @returns {Boolean} True if everything below passed - */ -jasmine.NestedResults.prototype.passed = function() { - return this.passedCount === this.totalCount; -}; -/** - * Base class for pretty printing for expectation results. - */ -jasmine.PrettyPrinter = function() { - this.ppNestLevel_ = 0; -}; - -/** - * Formats a value in a nice, human-readable string. - * - * @param value - */ -jasmine.PrettyPrinter.prototype.format = function(value) { - this.ppNestLevel_++; - try { - if (value === jasmine.undefined) { - this.emitScalar('undefined'); - } else if (value === null) { - this.emitScalar('null'); - } else if (value === jasmine.getGlobal()) { - this.emitScalar(''); - } else if (value.jasmineToString) { - this.emitScalar(value.jasmineToString()); - } else if (typeof value === 'string') { - this.emitString(value); - } else if (jasmine.isSpy(value)) { - this.emitScalar("spy on " + value.identity); - } else if (value instanceof RegExp) { - this.emitScalar(value.toString()); - } else if (typeof value === 'function') { - this.emitScalar('Function'); - } else if (typeof value.nodeType === 'number') { - this.emitScalar('HTMLNode'); - } else if (value instanceof Date) { - this.emitScalar('Date(' + value + ')'); - } else if (value.__Jasmine_been_here_before__) { - this.emitScalar(''); - } else if (jasmine.isArray_(value) || typeof value == 'object') { - value.__Jasmine_been_here_before__ = true; - if (jasmine.isArray_(value)) { - this.emitArray(value); - } else { - this.emitObject(value); - } - delete value.__Jasmine_been_here_before__; - } else { - this.emitScalar(value.toString()); - } - } finally { - this.ppNestLevel_--; - } -}; - -jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) { - for (var property in obj) { - if (!obj.hasOwnProperty(property)) continue; - if (property == '__Jasmine_been_here_before__') continue; - fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && - obj.__lookupGetter__(property) !== null) : false); - } -}; - -jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_; -jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_; -jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_; -jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_; - -jasmine.StringPrettyPrinter = function() { - jasmine.PrettyPrinter.call(this); - - this.string = ''; -}; -jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter); - -jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) { - this.append(value); -}; - -jasmine.StringPrettyPrinter.prototype.emitString = function(value) { - this.append("'" + value + "'"); -}; - -jasmine.StringPrettyPrinter.prototype.emitArray = function(array) { - if (this.ppNestLevel_ > jasmine.MAX_PRETTY_PRINT_DEPTH) { - this.append("Array"); - return; - } - - this.append('[ '); - for (var i = 0; i < array.length; i++) { - if (i > 0) { - this.append(', '); - } - this.format(array[i]); - } - this.append(' ]'); -}; - -jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) { - if (this.ppNestLevel_ > jasmine.MAX_PRETTY_PRINT_DEPTH) { - this.append("Object"); - return; - } - - var self = this; - this.append('{ '); - var first = true; - - this.iterateObject(obj, function(property, isGetter) { - if (first) { - first = false; - } else { - self.append(', '); - } - - self.append(property); - self.append(' : '); - if (isGetter) { - self.append(''); - } else { - self.format(obj[property]); - } - }); - - this.append(' }'); -}; - -jasmine.StringPrettyPrinter.prototype.append = function(value) { - this.string += value; -}; -jasmine.Queue = function(env) { - this.env = env; - - // parallel to blocks. each true value in this array means the block will - // get executed even if we abort - this.ensured = []; - this.blocks = []; - this.running = false; - this.index = 0; - this.offset = 0; - this.abort = false; -}; - -jasmine.Queue.prototype.addBefore = function(block, ensure) { - if (ensure === jasmine.undefined) { - ensure = false; - } - - this.blocks.unshift(block); - this.ensured.unshift(ensure); -}; - -jasmine.Queue.prototype.add = function(block, ensure) { - if (ensure === jasmine.undefined) { - ensure = false; - } - - this.blocks.push(block); - this.ensured.push(ensure); -}; - -jasmine.Queue.prototype.insertNext = function(block, ensure) { - if (ensure === jasmine.undefined) { - ensure = false; - } - - this.ensured.splice((this.index + this.offset + 1), 0, ensure); - this.blocks.splice((this.index + this.offset + 1), 0, block); - this.offset++; -}; - -jasmine.Queue.prototype.start = function(onComplete) { - this.running = true; - this.onComplete = onComplete; - this.next_(); -}; - -jasmine.Queue.prototype.isRunning = function() { - return this.running; -}; - -jasmine.Queue.LOOP_DONT_RECURSE = true; - -jasmine.Queue.prototype.next_ = function() { - var self = this; - var goAgain = true; - - while (goAgain) { - goAgain = false; - - if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) { - var calledSynchronously = true; - var completedSynchronously = false; - - var onComplete = function () { - if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) { - completedSynchronously = true; - return; - } - - if (self.blocks[self.index].abort) { - self.abort = true; - } - - self.offset = 0; - self.index++; - - var now = new Date().getTime(); - if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) { - self.env.lastUpdate = now; - self.env.setTimeout(function() { - self.next_(); - }, 0); - } else { - if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) { - goAgain = true; - } else { - self.next_(); - } - } - }; - self.blocks[self.index].execute(onComplete); - - calledSynchronously = false; - if (completedSynchronously) { - onComplete(); - } - - } else { - self.running = false; - if (self.onComplete) { - self.onComplete(); - } - } - } -}; - -jasmine.Queue.prototype.results = function() { - var results = new jasmine.NestedResults(); - for (var i = 0; i < this.blocks.length; i++) { - if (this.blocks[i].results) { - results.addResult(this.blocks[i].results()); - } - } - return results; -}; - - -/** - * Runner - * - * @constructor - * @param {jasmine.Env} env - */ -jasmine.Runner = function(env) { - var self = this; - self.env = env; - self.queue = new jasmine.Queue(env); - self.before_ = []; - self.after_ = []; - self.suites_ = []; -}; - -jasmine.Runner.prototype.execute = function() { - var self = this; - if (self.env.reporter.reportRunnerStarting) { - self.env.reporter.reportRunnerStarting(this); - } - self.queue.start(function () { - self.finishCallback(); - }); -}; - -jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) { - beforeEachFunction.typeName = 'beforeEach'; - this.before_.splice(0,0,beforeEachFunction); -}; - -jasmine.Runner.prototype.afterEach = function(afterEachFunction) { - afterEachFunction.typeName = 'afterEach'; - this.after_.splice(0,0,afterEachFunction); -}; - - -jasmine.Runner.prototype.finishCallback = function() { - this.env.reporter.reportRunnerResults(this); -}; - -jasmine.Runner.prototype.addSuite = function(suite) { - this.suites_.push(suite); -}; - -jasmine.Runner.prototype.add = function(block) { - if (block instanceof jasmine.Suite) { - this.addSuite(block); - } - this.queue.add(block); -}; - -jasmine.Runner.prototype.specs = function () { - var suites = this.suites(); - var specs = []; - for (var i = 0; i < suites.length; i++) { - specs = specs.concat(suites[i].specs()); - } - return specs; -}; - -jasmine.Runner.prototype.suites = function() { - return this.suites_; -}; - -jasmine.Runner.prototype.topLevelSuites = function() { - var topLevelSuites = []; - for (var i = 0; i < this.suites_.length; i++) { - if (!this.suites_[i].parentSuite) { - topLevelSuites.push(this.suites_[i]); - } - } - return topLevelSuites; -}; - -jasmine.Runner.prototype.results = function() { - return this.queue.results(); -}; -/** - * Internal representation of a Jasmine specification, or test. - * - * @constructor - * @param {jasmine.Env} env - * @param {jasmine.Suite} suite - * @param {String} description - */ -jasmine.Spec = function(env, suite, description) { - if (!env) { - throw new Error('jasmine.Env() required'); - } - if (!suite) { - throw new Error('jasmine.Suite() required'); - } - var spec = this; - spec.id = env.nextSpecId ? env.nextSpecId() : null; - spec.env = env; - spec.suite = suite; - spec.description = description; - spec.queue = new jasmine.Queue(env); - - spec.afterCallbacks = []; - spec.spies_ = []; - - spec.results_ = new jasmine.NestedResults(); - spec.results_.description = description; - spec.matchersClass = null; -}; - -jasmine.Spec.prototype.getFullName = function() { - return this.suite.getFullName() + ' ' + this.description + '.'; -}; - - -jasmine.Spec.prototype.results = function() { - return this.results_; -}; - -/** - * All parameters are pretty-printed and concatenated together, then written to the spec's output. - * - * Be careful not to leave calls to jasmine.log in production code. - */ -jasmine.Spec.prototype.log = function() { - return this.results_.log(arguments); -}; - -jasmine.Spec.prototype.runs = function (func) { - var block = new jasmine.Block(this.env, func, this); - this.addToQueue(block); - return this; -}; - -jasmine.Spec.prototype.addToQueue = function (block) { - if (this.queue.isRunning()) { - this.queue.insertNext(block); - } else { - this.queue.add(block); - } -}; - -/** - * @param {jasmine.ExpectationResult} result - */ -jasmine.Spec.prototype.addMatcherResult = function(result) { - this.results_.addResult(result); -}; - -jasmine.Spec.prototype.expect = function(actual) { - var positive = new (this.getMatchersClass_())(this.env, actual, this); - positive.not = new (this.getMatchersClass_())(this.env, actual, this, true); - return positive; -}; - -/** - * Waits a fixed time period before moving to the next block. - * - * @deprecated Use waitsFor() instead - * @param {Number} timeout milliseconds to wait - */ -jasmine.Spec.prototype.waits = function(timeout) { - var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this); - this.addToQueue(waitsFunc); - return this; -}; - -/** - * Waits for the latchFunction to return true before proceeding to the next block. - * - * @param {Function} latchFunction - * @param {String} optional_timeoutMessage - * @param {Number} optional_timeout - */ -jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { - var latchFunction_ = null; - var optional_timeoutMessage_ = null; - var optional_timeout_ = null; - - for (var i = 0; i < arguments.length; i++) { - var arg = arguments[i]; - switch (typeof arg) { - case 'function': - latchFunction_ = arg; - break; - case 'string': - optional_timeoutMessage_ = arg; - break; - case 'number': - optional_timeout_ = arg; - break; - } - } - - var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this); - this.addToQueue(waitsForFunc); - return this; -}; - -jasmine.Spec.prototype.fail = function (e) { - var expectationResult = new jasmine.ExpectationResult({ - passed: false, - message: e ? jasmine.util.formatException(e) : 'Exception', - trace: { stack: e.stack } - }); - this.results_.addResult(expectationResult); -}; - -jasmine.Spec.prototype.getMatchersClass_ = function() { - return this.matchersClass || this.env.matchersClass; -}; - -jasmine.Spec.prototype.addMatchers = function(matchersPrototype) { - var parent = this.getMatchersClass_(); - var newMatchersClass = function() { - parent.apply(this, arguments); - }; - jasmine.util.inherit(newMatchersClass, parent); - jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass); - this.matchersClass = newMatchersClass; -}; - -jasmine.Spec.prototype.finishCallback = function() { - this.env.reporter.reportSpecResults(this); -}; - -jasmine.Spec.prototype.finish = function(onComplete) { - this.removeAllSpies(); - this.finishCallback(); - if (onComplete) { - onComplete(); - } -}; - -jasmine.Spec.prototype.after = function(doAfter) { - if (this.queue.isRunning()) { - this.queue.add(new jasmine.Block(this.env, doAfter, this), true); - } else { - this.afterCallbacks.unshift(doAfter); - } -}; - -jasmine.Spec.prototype.execute = function(onComplete) { - var spec = this; - if (!spec.env.specFilter(spec)) { - spec.results_.skipped = true; - spec.finish(onComplete); - return; - } - - this.env.reporter.reportSpecStarting(this); - - spec.env.currentSpec = spec; - - spec.addBeforesAndAftersToQueue(); - - spec.queue.start(function () { - spec.finish(onComplete); - }); -}; - -jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() { - var runner = this.env.currentRunner(); - var i; - - for (var suite = this.suite; suite; suite = suite.parentSuite) { - for (i = 0; i < suite.before_.length; i++) { - this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this)); - } - } - for (i = 0; i < runner.before_.length; i++) { - this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this)); - } - for (i = 0; i < this.afterCallbacks.length; i++) { - this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this), true); - } - for (suite = this.suite; suite; suite = suite.parentSuite) { - for (i = 0; i < suite.after_.length; i++) { - this.queue.add(new jasmine.Block(this.env, suite.after_[i], this), true); - } - } - for (i = 0; i < runner.after_.length; i++) { - this.queue.add(new jasmine.Block(this.env, runner.after_[i], this), true); - } -}; - -jasmine.Spec.prototype.explodes = function() { - throw 'explodes function should not have been called'; -}; - -jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) { - if (obj == jasmine.undefined) { - throw "spyOn could not find an object to spy upon for " + methodName + "()"; - } - - if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) { - throw methodName + '() method does not exist'; - } - - if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) { - throw new Error(methodName + ' has already been spied upon'); - } - - var spyObj = jasmine.createSpy(methodName); - - this.spies_.push(spyObj); - spyObj.baseObj = obj; - spyObj.methodName = methodName; - spyObj.originalValue = obj[methodName]; - - obj[methodName] = spyObj; - - return spyObj; -}; - -jasmine.Spec.prototype.removeAllSpies = function() { - for (var i = 0; i < this.spies_.length; i++) { - var spy = this.spies_[i]; - spy.baseObj[spy.methodName] = spy.originalValue; - } - this.spies_ = []; -}; - -/** - * Internal representation of a Jasmine suite. - * - * @constructor - * @param {jasmine.Env} env - * @param {String} description - * @param {Function} specDefinitions - * @param {jasmine.Suite} parentSuite - */ -jasmine.Suite = function(env, description, specDefinitions, parentSuite) { - var self = this; - self.id = env.nextSuiteId ? env.nextSuiteId() : null; - self.description = description; - self.queue = new jasmine.Queue(env); - self.parentSuite = parentSuite; - self.env = env; - self.before_ = []; - self.after_ = []; - self.children_ = []; - self.suites_ = []; - self.specs_ = []; -}; - -jasmine.Suite.prototype.getFullName = function() { - var fullName = this.description; - for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { - fullName = parentSuite.description + ' ' + fullName; - } - return fullName; -}; - -jasmine.Suite.prototype.finish = function(onComplete) { - this.env.reporter.reportSuiteResults(this); - this.finished = true; - if (typeof(onComplete) == 'function') { - onComplete(); - } -}; - -jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) { - beforeEachFunction.typeName = 'beforeEach'; - this.before_.unshift(beforeEachFunction); -}; - -jasmine.Suite.prototype.afterEach = function(afterEachFunction) { - afterEachFunction.typeName = 'afterEach'; - this.after_.unshift(afterEachFunction); -}; - -jasmine.Suite.prototype.results = function() { - return this.queue.results(); -}; - -jasmine.Suite.prototype.add = function(suiteOrSpec) { - this.children_.push(suiteOrSpec); - if (suiteOrSpec instanceof jasmine.Suite) { - this.suites_.push(suiteOrSpec); - this.env.currentRunner().addSuite(suiteOrSpec); - } else { - this.specs_.push(suiteOrSpec); - } - this.queue.add(suiteOrSpec); -}; - -jasmine.Suite.prototype.specs = function() { - return this.specs_; -}; - -jasmine.Suite.prototype.suites = function() { - return this.suites_; -}; - -jasmine.Suite.prototype.children = function() { - return this.children_; -}; - -jasmine.Suite.prototype.execute = function(onComplete) { - var self = this; - this.queue.start(function () { - self.finish(onComplete); - }); -}; -jasmine.WaitsBlock = function(env, timeout, spec) { - this.timeout = timeout; - jasmine.Block.call(this, env, null, spec); -}; - -jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block); - -jasmine.WaitsBlock.prototype.execute = function (onComplete) { - if (jasmine.VERBOSE) { - this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); - } - this.env.setTimeout(function () { - onComplete(); - }, this.timeout); -}; -/** - * A block which waits for some condition to become true, with timeout. - * - * @constructor - * @extends jasmine.Block - * @param {jasmine.Env} env The Jasmine environment. - * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true. - * @param {Function} latchFunction A function which returns true when the desired condition has been met. - * @param {String} message The message to display if the desired condition hasn't been met within the given time period. - * @param {jasmine.Spec} spec The Jasmine spec. - */ -jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) { - this.timeout = timeout || env.defaultTimeoutInterval; - this.latchFunction = latchFunction; - this.message = message; - this.totalTimeSpentWaitingForLatch = 0; - jasmine.Block.call(this, env, null, spec); -}; -jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block); - -jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10; - -jasmine.WaitsForBlock.prototype.execute = function(onComplete) { - if (jasmine.VERBOSE) { - this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); - } - var latchFunctionResult; - try { - latchFunctionResult = this.latchFunction.apply(this.spec); - } catch (e) { - this.spec.fail(e); - onComplete(); - return; - } - - if (latchFunctionResult) { - onComplete(); - } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) { - var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen'); - this.spec.fail({ - name: 'timeout', - message: message - }); - - this.abort = true; - onComplete(); - } else { - this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT; - var self = this; - this.env.setTimeout(function() { - self.execute(onComplete); - }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); - } -}; - -jasmine.version_= { - "major": 1, - "minor": 3, - "build": 1, - "revision": 1354556913 -}; diff --git a/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js b/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js deleted file mode 100644 index e197595940..0000000000 --- a/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js +++ /dev/null @@ -1,104 +0,0 @@ -/** - Jasmine Reporter that outputs test results to the browser console. - Useful for running in a headless environment such as PhantomJs, ZombieJs etc. - - Usage: - // From your html file that loads jasmine: - jasmine.getEnv().addReporter(new jasmine.ConsoleReporter()); - jasmine.getEnv().execute(); -*/ - -(function(jasmine, console) { - if (!jasmine) { - throw "jasmine library isn't loaded!"; - } - - var ANSI = {} - ANSI.color_map = { - "green" : 32, - "red" : 31 - } - - ANSI.colorize_text = function(text, color) { - var color_code = this.color_map[color]; - return "\033[" + color_code + "m" + text + "\033[0m"; - } - - var ConsoleReporter = function() { - if (!console || !console.log) { throw "console isn't present!"; } - this.status = this.statuses.stopped; - }; - - var proto = ConsoleReporter.prototype; - proto.statuses = { - stopped : "stopped", - running : "running", - fail : "fail", - success : "success" - }; - - proto.reportRunnerStarting = function(runner) { - this.status = this.statuses.running; - this.start_time = (new Date()).getTime(); - this.executed_specs = 0; - this.passed_specs = 0; - this.log("Starting..."); - }; - - proto.reportRunnerResults = function(runner) { - var failed = this.executed_specs - this.passed_specs; - var spec_str = this.executed_specs + (this.executed_specs === 1 ? " spec, " : " specs, "); - var fail_str = failed + (failed === 1 ? " failure in " : " failures in "); - var color = (failed > 0)? "red" : "green"; - var dur = (new Date()).getTime() - this.start_time; - - this.log(""); - this.log("Finished"); - this.log("-----------------"); - this.log(spec_str + fail_str + (dur/1000) + "s.", color); - - this.status = (failed > 0)? this.statuses.fail : this.statuses.success; - - /* Print something that signals that testing is over so that headless browsers - like PhantomJs know when to terminate. */ - this.log(""); - this.log("ConsoleReporter finished"); - }; - - - proto.reportSpecStarting = function(spec) { - this.executed_specs++; - }; - - proto.reportSpecResults = function(spec) { - if (spec.results().passed()) { - this.passed_specs++; - return; - } - - var resultText = spec.suite.description + " : " + spec.description; - this.log(resultText, "red"); - - var items = spec.results().getItems() - for (var i = 0; i < items.length; i++) { - var trace = items[i].trace.stack || items[i].trace; - this.log(trace, "red"); - } - }; - - proto.reportSuiteResults = function(suite) { - if (!suite.parentSuite) { return; } - var results = suite.results(); - var failed = results.totalCount - results.passedCount; - var color = (failed > 0)? "red" : "green"; - this.log(suite.getFullName() + ": " + results.passedCount + " of " + results.totalCount + " passed.", color); - }; - - proto.log = function(str, color) { - var text = (color != undefined)? ANSI.colorize_text(str, color) : str; - console.log(text) - }; - - jasmine.ConsoleReporter = ConsoleReporter; -})(jasmine, console); - diff --git a/www/js/fingerprint/specs/lib/phantom-jasmine/run_jasmine_test.coffee b/www/js/fingerprint/specs/lib/phantom-jasmine/run_jasmine_test.coffee deleted file mode 100644 index 3c276aeabc..0000000000 --- a/www/js/fingerprint/specs/lib/phantom-jasmine/run_jasmine_test.coffee +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/local/bin/phantomjs - -# Runs a Jasmine Suite from an html page -# @page is a PhantomJs page object -# @exit_func is the function to call in order to exit the script - -class PhantomJasmineRunner - constructor: (@page, @exit_func = phantom.exit) -> - @tries = 0 - @max_tries = 10 - - get_status: -> @page.evaluate(-> console_reporter.status) - - terminate: -> - switch @get_status() - when "success" then @exit_func 0 - when "fail" then @exit_func 1 - else @exit_func 2 - -# Script Begin -if phantom.args.length == 0 - console.log "Need a url as the argument" - phantom.exit 1 - -page = new WebPage() - -runner = new PhantomJasmineRunner(page) - -# Don't supress console output -page.onConsoleMessage = (msg) -> - console.log msg - - # Terminate when the reporter singals that testing is over. - # We cannot use a callback function for this (because page.evaluate is sandboxed), - # so we have to *observe* the website. - if msg == "ConsoleReporter finished" - runner.terminate() - -address = phantom.args[0] - -page.open address, (status) -> - if status != "success" - console.log "can't load the address!" - phantom.exit 1 - - # Now we wait until onConsoleMessage reads the termination signal from the log. diff --git a/www/js/fingerprint/specs/run.sh b/www/js/fingerprint/specs/run.sh deleted file mode 100644 index 247acac1bb..0000000000 --- a/www/js/fingerprint/specs/run.sh +++ /dev/null @@ -1 +0,0 @@ -phantomjs lib/phantom-jasmine/run_jasmine_test.coffee test_runner.html diff --git a/www/js/fingerprint/specs/test_runner.html b/www/js/fingerprint/specs/test_runner.html deleted file mode 100644 index a05ae60b6e..0000000000 --- a/www/js/fingerprint/specs/test_runner.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - Jasmine Test Runner - - - - - - - - - - - - - diff --git a/www/theme/default/style.css b/www/theme/default/style.css index d5a77c6729..0263440d76 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -2,7 +2,7 @@ * The css file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) -* @license ZPL (http://zpl.pub/page/zplv12.html) +* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package front * @version $Id: style.css 1454 2009-10-23 01:45:26Z wwccss $ @@ -91,3 +91,4 @@ a.showMoreImage:hover {opacity: 1;} #headerActions .dropdown-menu:before, #headerActions .dropdown-menu:hover:before {position: absolute; top: -9px; right: 50%; width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;} .icon-size-width:before {content: "\e9c5"; transform: rotate(90deg); -ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -webkit-transform: rotate(90deg); -o-transform: rotate(90deg);} +.checkbox-primary > label{overflow: hidden;} diff --git a/www/upgrade.php.tmp b/www/upgrade.php.tmp index b51a015ad8..cb16f99203 100644 --- a/www/upgrade.php.tmp +++ b/www/upgrade.php.tmp @@ -3,7 +3,7 @@ * The upgrade router file of ZenTaoPMS. * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang * @package ZenTaoPMS * @version $Id: upgrade.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $ diff --git a/xuanxuan/extension/xuan/admin/ext/view/xuanxuan.html.php b/xuanxuan/extension/xuan/admin/ext/view/xuanxuan.html.php index 4e2bd97515..934576de69 100644 --- a/xuanxuan/extension/xuan/admin/ext/view/xuanxuan.html.php +++ b/xuanxuan/extension/xuan/admin/ext/view/xuanxuan.html.php @@ -3,7 +3,7 @@ * The index view file of index module of XXB. * * @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package index * @version $Id: index.html.php 4205 2016-10-24 08:19:13Z liugang $ diff --git a/xuanxuan/extension/xuan/client/ext/view/browse.html.php b/xuanxuan/extension/xuan/client/ext/view/browse.html.php index 18567b875d..d658995496 100644 --- a/xuanxuan/extension/xuan/client/ext/view/browse.html.php +++ b/xuanxuan/extension/xuan/client/ext/view/browse.html.php @@ -3,7 +3,7 @@ * The browse view file of client module of XXB. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Memory * @package client * @version $Id$ diff --git a/xuanxuan/extension/xuan/client/ext/view/safe.html.php b/xuanxuan/extension/xuan/client/ext/view/safe.html.php index ea1adc207d..82b3c29779 100644 --- a/xuanxuan/extension/xuan/client/ext/view/safe.html.php +++ b/xuanxuan/extension/xuan/client/ext/view/safe.html.php @@ -3,7 +3,7 @@ * The safe view file of client module of ZentaoPMS. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Yidong Wang * @package client * @version $Id$ diff --git a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php index af63fb354a..8d83b0cd89 100644 --- a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php +++ b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php @@ -3,7 +3,7 @@ * The configure xuanxuan view file of setting module of RanZhi. * * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) - * @license ZPL (http://zpl.pub/page/zplv12.html) + * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Gang Liu * @package setting * @version $Id$