diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1a682f8be0..0000000000 --- a/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -config/my.php -www/data/ -www/install.php -www/upgrade.php -www/ok.txt -tools/* -release/* -tmp/* -tmp/extensions/* -tmp/log/* -tmp/model/* -tmp/cache/* -tmp/extension/* -.gitkeep -.bak -.idea -.gitignore -_log -framework/ \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4c..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/db/update9.5.1.sql b/db/update9.5.1.sql index 88c7cd1fdb..789f54ab2e 100644 --- a/db/update9.5.1.sql +++ b/db/update9.5.1.sql @@ -27,3 +27,15 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` ( `editedDate` datetime NOT NULL, PRIMARY KEY `id` (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +ALTER TABLE `zt_task` ADD `parent` INT(11) NULL DEFAULT '0' AFTER `deleted`; +ALTER TABLE `zt_team` ADD `task` INT(11) NULL DEFAULT '0' AFTER `project`; +ALTER TABLE `zt_team` ADD `estimate` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0'; +ALTER TABLE `zt_team` ADD `consumed` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0' AFTER `estimate`; +ALTER TABLE `zt_team` ADD `left` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0' AFTER `consumed`; +ALTER TABLE `zt_team` ADD `order` TINYINT(3) NOT NULL DEFAULT '0' AFTER `left`; +ALTER TABLE `zt_team` CHANGE `days` `days` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0'; + + +ALTER TABLE `zt_team` DROP PRIMARY KEY; +ALTER TABLE `zt_team` ADD PRIMARY KEY (`project`, `task`, `account`); \ No newline at end of file diff --git a/framework/helper.class.php b/framework/helper.class.php index dc33d2ffa0..39a7629714 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -140,12 +140,4 @@ function formatTime($time, $format = '') if(trim($time) == '') return ; if($format) return date($format, strtotime($time)); return trim($time); -} - -function b($val) -{ - echo '
';
-    print_r($val);
-    echo '
'; - exit; } \ No newline at end of file diff --git a/module/action/ext/config/.gitkeep b/module/action/ext/config/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/control/.gitkeep b/module/action/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/css/.gitkeep b/module/action/ext/css/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/js/.gitkeep b/module/action/ext/js/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/lang/en/.gitkeep b/module/action/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/lang/zh-cn/.gitkeep b/module/action/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/lang/zh-tw/.gitkeep b/module/action/ext/lang/zh-tw/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/model/.gitkeep b/module/action/ext/model/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/action/ext/view/.gitkeep b/module/action/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/admin/ext/config/.gitkeep b/module/admin/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/control/.gitkeep b/module/admin/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/css/.gitkeep b/module/admin/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/js/.gitkeep b/module/admin/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/lang/en/.gitkeep b/module/admin/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/lang/zh-cn/.gitkeep b/module/admin/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/lang/zh-tw/.gitkeep b/module/admin/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/model/.gitkeep b/module/admin/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/admin/ext/view/.gitkeep b/module/admin/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/config/.gitkeep b/module/api/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/control/.gitkeep b/module/api/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/css/.gitkeep b/module/api/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/js/.gitkeep b/module/api/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/lang/en/.gitkeep b/module/api/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/lang/zh-cn/.gitkeep b/module/api/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/lang/zh-tw/.gitkeep b/module/api/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/model/.gitkeep b/module/api/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/api/ext/view/.gitkeep b/module/api/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/build/ext/config/.gitkeep b/module/build/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/build/ext/control/.gitkeep b/module/build/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/build/ext/css/.gitkeep b/module/build/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/build/ext/js/.gitkeep b/module/build/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/build/ext/lang/en/.gitkeep b/module/build/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/build/ext/lang/zh-cn/.gitkeep b/module/build/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/build/ext/lang/zh-tw/.gitkeep b/module/build/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/build/ext/model/.gitkeep b/module/build/ext/model/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/build/ext/view/.gitkeep b/module/build/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/common/ext/config/.gitkeep b/module/common/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/ext/control/.gitkeep b/module/common/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/ext/css/.gitkeep b/module/common/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/ext/js/.gitkeep b/module/common/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/ext/lang/en/.gitkeep b/module/common/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/common/ext/lang/zh-cn/.gitkeep b/module/common/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/common/ext/lang/zh-tw/.gitkeep b/module/common/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/ext/model/.gitkeep b/module/common/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/ext/view/.gitkeep b/module/common/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/config/.gitkeep b/module/company/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/control/.gitkeep b/module/company/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/css/.gitkeep b/module/company/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/js/.gitkeep b/module/company/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/lang/en/.gitkeep b/module/company/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/lang/zh-cn/.gitkeep b/module/company/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/lang/zh-tw/.gitkeep b/module/company/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/model/.gitkeep b/module/company/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/company/ext/view/.gitkeep b/module/company/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/config/.gitkeep b/module/convert/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/control/.gitkeep b/module/convert/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/css/.gitkeep b/module/convert/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/js/.gitkeep b/module/convert/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/lang/en/.gitkeep b/module/convert/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/lang/zh-cn/.gitkeep b/module/convert/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/lang/zh-tw/.gitkeep b/module/convert/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/model/.gitkeep b/module/convert/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/convert/ext/view/.gitkeep b/module/convert/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/config/.gitkeep b/module/dept/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/control/.gitkeep b/module/dept/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/css/.gitkeep b/module/dept/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/js/.gitkeep b/module/dept/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/lang/en/.gitkeep b/module/dept/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/lang/zh-cn/.gitkeep b/module/dept/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/lang/zh-tw/.gitkeep b/module/dept/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/model/.gitkeep b/module/dept/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/dept/ext/view/.gitkeep b/module/dept/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/config/.gitkeep b/module/doc/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/control/.gitkeep b/module/doc/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/css/.gitkeep b/module/doc/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/js/.gitkeep b/module/doc/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/lang/en/.gitkeep b/module/doc/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/doc/ext/lang/zh-cn/.gitkeep b/module/doc/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/doc/ext/lang/zh-tw/.gitkeep b/module/doc/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/model/.gitkeep b/module/doc/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/doc/ext/view/.gitkeep b/module/doc/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/config/.gitkeep b/module/editor/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/control/.gitkeep b/module/editor/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/css/.gitkeep b/module/editor/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/js/.gitkeep b/module/editor/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/lang/en/.gitkeep b/module/editor/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/lang/zh-cn/.gitkeep b/module/editor/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/lang/zh-tw/.gitkeep b/module/editor/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/model/.gitkeep b/module/editor/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/editor/ext/view/.gitkeep b/module/editor/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/extension/ext/config/.gitkeep b/module/extension/ext/config/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/control/.gitkeep b/module/extension/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/css/.gitkeep b/module/extension/ext/css/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/js/.gitkeep b/module/extension/ext/js/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/lang/en/.gitkeep b/module/extension/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/lang/zh-cn/.gitkeep b/module/extension/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/lang/zh-tw/.gitkeep b/module/extension/ext/lang/zh-tw/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/model/.gitkeep b/module/extension/ext/model/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/extension/ext/view/.gitkeep b/module/extension/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/file/ext/config/.gitkeep b/module/file/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/control/.gitkeep b/module/file/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/css/.gitkeep b/module/file/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/js/.gitkeep b/module/file/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/lang/en/.gitkeep b/module/file/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/lang/zh-cn/.gitkeep b/module/file/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/lang/zh-tw/.gitkeep b/module/file/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/model/.gitkeep b/module/file/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/file/ext/view/.gitkeep b/module/file/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/config/.gitkeep b/module/git/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/control/.gitkeep b/module/git/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/css/.gitkeep b/module/git/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/js/.gitkeep b/module/git/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/lang/.gitkeep b/module/git/ext/lang/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/model/.gitkeep b/module/git/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/git/ext/view/.gitkeep b/module/git/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/config/.gitkeep b/module/group/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/control/.gitkeep b/module/group/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/css/.gitkeep b/module/group/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/js/.gitkeep b/module/group/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/lang/en/.gitkeep b/module/group/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/group/ext/lang/zh-cn/.gitkeep b/module/group/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/group/ext/lang/zh-tw/.gitkeep b/module/group/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/model/.gitkeep b/module/group/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/group/ext/view/.gitkeep b/module/group/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/config/.gitkeep b/module/index/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/control/.gitkeep b/module/index/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/css/.gitkeep b/module/index/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/js/.gitkeep b/module/index/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/lang/en/.gitkeep b/module/index/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/lang/zh-cn/.gitkeep b/module/index/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/lang/zh-tw/.gitkeep b/module/index/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/model/.gitkeep b/module/index/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/index/ext/view/.gitkeep b/module/index/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/config/.gitkeep b/module/install/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/control/.gitkeep b/module/install/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/css/.gitkeep b/module/install/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/js/.gitkeep b/module/install/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/lang/en/.gitkeep b/module/install/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/lang/zh-cn/.gitkeep b/module/install/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/lang/zh-tw/.gitkeep b/module/install/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/model/.gitkeep b/module/install/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/install/ext/view/.gitkeep b/module/install/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/config/.gitkeep b/module/mail/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/control/.gitkeep b/module/mail/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/css/.gitkeep b/module/mail/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/js/.gitkeep b/module/mail/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/lang/en/.gitkeep b/module/mail/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/lang/zh-cn/.gitkeep b/module/mail/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/lang/zh-tw/.gitkeep b/module/mail/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/model/.gitkeep b/module/mail/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/mail/ext/view/.gitkeep b/module/mail/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/config/.gitkeep b/module/misc/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/control/.gitkeep b/module/misc/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/css/.gitkeep b/module/misc/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/js/.gitkeep b/module/misc/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/lang/en/.gitkeep b/module/misc/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/lang/zh-cn/.gitkeep b/module/misc/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/lang/zh-tw/.gitkeep b/module/misc/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/model/.gitkeep b/module/misc/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/misc/ext/view/.gitkeep b/module/misc/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/my/ext/config/.gitkeep b/module/my/ext/config/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/my/ext/control/.gitkeep b/module/my/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/my/ext/css/.gitkeep b/module/my/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/my/ext/js/.gitkeep b/module/my/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/my/ext/lang/en/.gitkeep b/module/my/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/my/ext/lang/zh-cn/.gitkeep b/module/my/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/my/ext/lang/zh-tw/.gitkeep b/module/my/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/my/ext/model/.gitkeep b/module/my/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/my/ext/view/.gitkeep b/module/my/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/product/ext/config/.gitkeep b/module/product/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/product/ext/control/.gitkeep b/module/product/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/product/ext/css/.gitkeep b/module/product/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/product/ext/js/.gitkeep b/module/product/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/product/ext/lang/en/.gitkeep b/module/product/ext/lang/en/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/product/ext/lang/zh-cn/.gitkeep b/module/product/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/product/ext/lang/zh-tw/.gitkeep b/module/product/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/product/ext/model/.gitkeep b/module/product/ext/model/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/product/ext/view/.gitkeep b/module/product/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/config/.gitkeep b/module/productplan/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/control/.gitkeep b/module/productplan/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/css/.gitkeep b/module/productplan/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/js/.gitkeep b/module/productplan/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/lang/en/.gitkeep b/module/productplan/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/lang/zh-cn/.gitkeep b/module/productplan/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/lang/zh-tw/.gitkeep b/module/productplan/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/model/.gitkeep b/module/productplan/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/productplan/ext/view/.gitkeep b/module/productplan/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/config/.gitkeep b/module/project/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/control/.gitkeep b/module/project/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/css/.gitkeep b/module/project/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/js/.gitkeep b/module/project/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/lang/en/.gitkeep b/module/project/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/lang/zh-cn/.gitkeep b/module/project/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/lang/zh-tw/.gitkeep b/module/project/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/model/.gitkeep b/module/project/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/ext/view/.gitkeep b/module/project/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/project/js/common.js b/module/project/js/common.js index dc3a24d66a..24c3c6b85f 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -174,3 +174,20 @@ $(function() computeWorkDays(this.id); }) }); + +$('.task-toggle').click(function() +{ + var obj = $(this).find('i'); + var id = $(this).data('id'); + if(obj.hasClass('icon-plus')) + { + $('tr.parent-'+id).show(); + obj.removeClass('icon-plus').addClass('icon-minus'); + } + else if(obj.hasClass('icon-minus')) + { + $('tr.parent-'+id).hide(); + obj.removeClass('icon-minus').addClass('icon-plus'); + } + return false; +}); diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index f9ce51581f..2f2022c87c 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -70,7 +70,7 @@ js::set('browseType', $browseType); $value) $this->task->printCell($value, $task, $users, $browseType, $branchGroups, $modulePairs);?> - children):?> + children)):?> children as $child):?> $value) $this->task->printCell($value, $child, $users, $browseType, $branchGroups, $modulePairs);?> diff --git a/module/qa/ext/config/.gitkeep b/module/qa/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/control/.gitkeep b/module/qa/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/css/.gitkeep b/module/qa/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/js/.gitkeep b/module/qa/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/lang/en/.gitkeep b/module/qa/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/lang/zh-cn/.gitkeep b/module/qa/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/lang/zh-tw/.gitkeep b/module/qa/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/model/.gitkeep b/module/qa/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/qa/ext/view/.gitkeep b/module/qa/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/report/ext/config/.gitkeep b/module/report/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/report/ext/control/.gitkeep b/module/report/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/report/ext/css/.gitkeep b/module/report/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/report/ext/js/.gitkeep b/module/report/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/report/ext/lang/en/.gitkeep b/module/report/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/report/ext/lang/zh-cn/.gitkeep b/module/report/ext/lang/zh-cn/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/report/ext/lang/zh-tw/.gitkeep b/module/report/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/report/ext/model/.gitkeep b/module/report/ext/model/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/report/ext/view/.gitkeep b/module/report/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/search/ext/config/.gitkeep b/module/search/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/control/.gitkeep b/module/search/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/css/.gitkeep b/module/search/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/js/.gitkeep b/module/search/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/lang/en/.gitkeep b/module/search/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/lang/zh-cn/.gitkeep b/module/search/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/lang/zh-tw/.gitkeep b/module/search/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/model/.gitkeep b/module/search/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/search/ext/view/.gitkeep b/module/search/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/config/.gitkeep b/module/setting/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/control/.gitkeep b/module/setting/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/css/.gitkeep b/module/setting/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/js/.gitkeep b/module/setting/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/lang/en/.gitkeep b/module/setting/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/lang/zh-cn/.gitkeep b/module/setting/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/lang/zh-tw/.gitkeep b/module/setting/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/model/.gitkeep b/module/setting/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/setting/ext/view/.gitkeep b/module/setting/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/config/.gitkeep b/module/story/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/control/.gitkeep b/module/story/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/css/.gitkeep b/module/story/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/js/.gitkeep b/module/story/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/lang/en/.gitkeep b/module/story/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/lang/zh-cn/.gitkeep b/module/story/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/lang/zh-tw/.gitkeep b/module/story/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/model/.gitkeep b/module/story/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/story/ext/view/.gitkeep b/module/story/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/config/.gitkeep b/module/svn/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/control/.gitkeep b/module/svn/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/css/.gitkeep b/module/svn/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/js/.gitkeep b/module/svn/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/lang/en/.gitkeep b/module/svn/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/lang/zh-cn/.gitkeep b/module/svn/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/lang/zh-tw/.gitkeep b/module/svn/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/model/.gitkeep b/module/svn/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/svn/ext/view/.gitkeep b/module/svn/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/task/js/create.js b/module/task/js/create.js index bdb27f8b2f..b9b90827af 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -224,4 +224,4 @@ $(".btn[data-toggle='modalTeam']").click(function() { $('#modalTeam').modal('show'); adjustSortBtn(); -}); \ No newline at end of file +}); diff --git a/module/task/js/edit.js b/module/task/js/edit.js index 401c03d80e..72e23de445 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -88,4 +88,4 @@ $(document).ready(function() $('#teamTr').addClass('hidden'); } }); -}); \ No newline at end of file +}); diff --git a/module/task/model.php b/module/task/model.php index aada9a44dc..6f69dce32d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1082,7 +1082,7 @@ class taskModel extends model $taskList = array_keys($tasks); $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->in($taskList)->orderBy('id_desc')->fetchGroup('parent'); - if($children) foreach($children as $key => $child) $tasks[$key]->children = $child; + if(!empty($children)) foreach($children as $key => $child) $tasks[$key]->children = $child; $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task'); if($teams) foreach($teams as $key => $team) if(!empty($team)) $tasks[$key]->team = $team; @@ -1362,7 +1362,7 @@ class taskModel extends model foreach($tasks as $task) { $task = $this->processTask($task); - if(isset($task->children)) + if(!empty($task->children)) { foreach($task->children as $child) $task = $this->processTask($child); } @@ -1393,7 +1393,7 @@ class taskModel extends model /* Story changed or not. */ $task->needConfirm = false; - if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true; + if(!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true; /* Set product type for task. */ if(isset($task->product)) @@ -1832,16 +1832,17 @@ class taskModel extends model echo ""; break; case 'name': - if(isset($branchGroups[$task->product][$task->branch])) echo "" . $branchGroups[$task->product][$task->branch] . ' '; + if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "" . $branchGroups[$task->product][$task->branch] . ' '; if($modulePairs and $task->module) echo "" . $modulePairs[$task->module] . ' '; echo html::a($taskLink, $task->name, null, "style='color: $task->color'"); if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'"); + if(!empty($task->children)) echo '    '; break; case 'type': echo $this->lang->task->typeList[$task->type]; break; case 'status': - $storyChanged = ($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion); + $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion); $storyChanged ? print("{$this->lang->story->changed} ") : print($this->lang->task->statusList[$task->status]); break; case 'estimate': @@ -1899,7 +1900,7 @@ class taskModel extends model echo $this->lang->task->reasonList[$task->closedReason]; break; case 'story': - if($task->storyID) + if(!empty($task->storyID)) { if(!common::printLink('story', 'view', "storyid=$task->storyID", $task->storyTitle)) print $task->storyTitle; } @@ -1932,7 +1933,7 @@ class taskModel extends model common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); common::printIcon('task', 'edit',"taskID=$task->id", $task, 'list'); - if(!$task->team or !$task->children) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'list','plus','','','','',$this->lang->task->children); + if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'list','plus','','','','',$this->lang->task->children); break; } echo ''; diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 3decac4ae3..418625d699 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -87,7 +87,6 @@
storyVerify;?>
- cases) and $task->cases):?>
task->case;?> @@ -98,7 +97,52 @@
- + children)):?> +
+ lang->task->children;?> + + + + + + + + + + + + + children as $child):?> + + + + + + + + + + + + +
task->id;?> task->lblPri;?> task->name;?>task->deadline;?> task->assignedTo;?> task->status;?> task->consumedAB . $lang->task->lblHour;?>task->leftAB . $lang->task->lblHour;?>actions;?>
id;?> + lang->task->priList, $child->pri, $child->pri) . "'>"; + echo $child->pri == '0' ? '' : zget($this->lang->task->priList, $child->pri, $child->pri); + echo ""; + ?> + id"); ?>">name;?>deadline;?>assignedTo])) echo $users[$child->assignedTo];?>task->statusList, $child->status);?>consumed;?>left;?> + project&taskID=$child->id", $child, 'list', '', '', 'iframe', true); + common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); + common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true); + common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); + common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); + common::printIcon('task', 'edit',"taskID=$child->id", $child, 'list'); + ?> +
+
+ fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
deleted) echo $actionLinks;?>
diff --git a/module/testcase/ext/config/.gitkeep b/module/testcase/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/control/.gitkeep b/module/testcase/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/css/.gitkeep b/module/testcase/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/js/.gitkeep b/module/testcase/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/lang/en/.gitkeep b/module/testcase/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/lang/zh-cn/.gitkeep b/module/testcase/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/lang/zh-tw/.gitkeep b/module/testcase/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/model/.gitkeep b/module/testcase/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testcase/ext/view/.gitkeep b/module/testcase/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/config/.gitkeep b/module/testtask/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/control/.gitkeep b/module/testtask/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/css/.gitkeep b/module/testtask/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/js/.gitkeep b/module/testtask/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/lang/en/.gitkeep b/module/testtask/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/lang/zh-cn/.gitkeep b/module/testtask/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/lang/zh-tw/.gitkeep b/module/testtask/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/model/.gitkeep b/module/testtask/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/testtask/ext/view/.gitkeep b/module/testtask/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/todo/ext/config/.gitkeep b/module/todo/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/control/.gitkeep b/module/todo/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/css/.gitkeep b/module/todo/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/js/.gitkeep b/module/todo/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/lang/en/.gitkeep b/module/todo/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/lang/zh-cn/.gitkeep b/module/todo/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/lang/zh-tw/.gitkeep b/module/todo/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/model/.gitkeep b/module/todo/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/todo/ext/view/.gitkeep b/module/todo/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/config/.gitkeep b/module/tree/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/control/.gitkeep b/module/tree/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/css/.gitkeep b/module/tree/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/js/.gitkeep b/module/tree/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/lang/en/.gitkeep b/module/tree/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/lang/zh-cn/.gitkeep b/module/tree/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/lang/zh-tw/.gitkeep b/module/tree/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/model/.gitkeep b/module/tree/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/tree/ext/view/.gitkeep b/module/tree/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/config/.gitkeep b/module/upgrade/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/control/.gitkeep b/module/upgrade/ext/control/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/css/.gitkeep b/module/upgrade/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/js/.gitkeep b/module/upgrade/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/lang/en/.gitkeep b/module/upgrade/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/lang/zh-cn/.gitkeep b/module/upgrade/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/lang/zh-tw/.gitkeep b/module/upgrade/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/model/.gitkeep b/module/upgrade/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/upgrade/ext/view/.gitkeep b/module/upgrade/ext/view/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/config/.gitkeep b/module/user/ext/config/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/control/.gitkeep b/module/user/ext/control/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/user/ext/css/.gitkeep b/module/user/ext/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/js/.gitkeep b/module/user/ext/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/lang/en/.gitkeep b/module/user/ext/lang/en/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/lang/zh-cn/.gitkeep b/module/user/ext/lang/zh-cn/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/lang/zh-tw/.gitkeep b/module/user/ext/lang/zh-tw/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/model/.gitkeep b/module/user/ext/model/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/user/ext/view/.gitkeep b/module/user/ext/view/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/tmp/cache/.gitkeep b/tmp/cache/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/tmp/extension/.gitkeep b/tmp/extension/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/tmp/log/.gitkeep b/tmp/log/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/tmp/model/.gitkeep b/tmp/model/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/tools/check.php b/tools/check.php deleted file mode 100755 index 419e1eb2cc..0000000000 --- a/tools/check.php +++ /dev/null @@ -1,259 +0,0 @@ -global = new stdclass(); -$config->global->flow = 'full'; - -/* set module root path and included the resource of group module. */ -$moduleRoot = '../module/'; -include $moduleRoot . '/group/lang/resource.php'; -foreach(glob($moduleRoot . '/group/ext/lang/zh-cn/*.php') as $resourceFile) -{ - include $resourceFile; -} - -$lang->productCommon = ''; -$lang->projectCommon = ''; - -$whiteList[] = 'api-getsessionid'; -$whiteList[] = 'admin-setflow'; -$whiteList[] = 'bug-buildtemplates'; -$whiteList[] = 'bug-sendmail'; -$whiteList[] = 'board-managechild'; -$whiteList[] = 'custom-menu'; -$whiteList[] = 'company-create'; -$whiteList[] = 'company-delete'; -$whiteList[] = 'file-buildexporttpl'; -$whiteList[] = 'file-buildform'; -$whiteList[] = 'file-printfiles'; -$whiteList[] = 'file-export2csv'; -$whiteList[] = 'file-export2xml'; -$whiteList[] = 'file-export2html'; -$whiteList[] = 'file-export2excel'; -$whiteList[] = 'file-export2word'; -$whiteList[] = 'file-senddownheader'; -$whiteList[] = 'file-read'; -$whiteList[] = 'help-field'; -$whiteList[] = 'index-testext'; -$whiteList[] = 'productplan-commonaction'; -$whiteList[] = 'project-managechilds'; -$whiteList[] = 'project-tips'; -$whiteList[] = 'project-commonaction'; -$whiteList[] = 'project-sendmail'; -$whiteList[] = 'release-commonaction'; -$whiteList[] = 'task-commonaction'; -$whiteList[] = 'task-sendmail'; -$whiteList[] = 'testtask-sendmail'; -$whiteList[] = 'user-login'; -$whiteList[] = 'user-deny'; -$whiteList[] = 'user-logout'; -$whiteList[] = 'user-setreferer'; -$whiteList[] = 'svn-run'; -$whiteList[] = 'git-run'; -$whiteList[] = 'admin-ignore'; -$whiteList[] = 'admin-register'; -$whiteList[] = 'admin-win2unix'; -$whiteList[] = 'admin-bind'; -$whiteList[] = 'admin-certifyztemail'; -$whiteList[] = 'admin-certifyztmobile'; -$whiteList[] = 'admin-ztcompany'; -$whiteList[] = 'story-commonaction'; -$whiteList[] = 'story-sendmail'; -$whiteList[] = 'webapp-ajaxaddview'; -$whiteList[] = 'report-remind'; -$whiteList[] = 'sso-auth'; -$whiteList[] = 'sso-depts'; -$whiteList[] = 'sso-users'; -$whiteList[] = 'sso-login'; -$whiteList[] = 'sso-logout'; -$whiteList[] = 'sso-bind'; -$whiteList[] = 'sso-getuserpairs'; -$whiteList[] = 'sso-getbindusers'; -$whiteList[] = 'sso-binduser'; -$whiteList[] = 'sso-createuser'; -$whiteList[] = 'sso-gettodolist'; -$whiteList[] = 'mail-asyncsend'; -$whiteList[] = 'user-reset'; -$whiteList[] = 'product-showerrornone'; -$whiteList[] = 'tutorial-start'; -$whiteList[] = 'tutorial-index'; -$whiteList[] = 'tutorial-quit'; -$whiteList[] = 'tutorial-wizard'; -$whiteList[] = 'my-buildcontactlists'; -$whiteList[] = 'mail-ztcloud'; -$whiteList[] = 'doc-diff'; -$whiteList[] = 'testreport-commonaction'; -$whiteList[] = 'testsuite-library'; -$whiteList[] = 'testsuite-createlib'; -$whiteList[] = 'testsuite-createcase'; -$whiteList[] = 'testsuite-libview'; - - -/* checking actions of every module. */ -echo '-------------action checking-----------------' . "\n"; -foreach(glob($moduleRoot . '*') as $modulePath) -{ - $moduleName = basename($modulePath); - if(strpos('install|upgrade|convert|common|misc|editor', $moduleName) !== false) continue; - $controlFile = $modulePath . '/control.php'; - if(file_exists($controlFile)) - { - include $controlFile; - if(class_exists($moduleName)) - { - if($moduleName == 'block') continue; - $class = new ReflectionClass($moduleName); - $methods = $class->getMethods(); - foreach($methods as $method) - { - $methodRef = new ReflectionMethod($method->class, $method->name); - if($methodRef->isPublic() and strpos($method->name, '__') === false) - { - $methodName = $method->name; - if(in_array($moduleName . '-' . strtolower($method->name), $whiteList)) continue; - if(strpos($methodName, 'ajax') !== false) continue; - - $exits = false; - if(isset($lang->resource->$moduleName)) - { - foreach($lang->resource->$moduleName as $key => $label) - { - if(strtolower($methodName) == strtolower($key)) $exits = true; - } - } - if(!$exits) echo $moduleName . "\t" . $methodName . " not in the list. \n"; - } - } - } - } - - /* Checking extension files. */ - $extControlFiles = glob($modulePath . '/ext/control/*.php'); - if($extControlFiles) - { - foreach($extControlFiles as $extControlFile) - { - $methodFile = substr($extControlFile, strrpos($extControlFile, '/') + 1); - $methodName = substr($methodFile, 0, strpos($methodFile, '.')); - if(in_array($moduleName . '-' . strtolower($methodName), $whiteList)) continue; - if(strpos($methodName, 'ajax') !== false) continue; - - $exits = false; - foreach($lang->resource->$moduleName as $key => $label) - { - if(strtolower($methodName) == strtolower($key)) $exits = true; - } - if(!$exits) echo $moduleName . "\t" . $methodName . " not in the list. \n"; - } - } -} - -/* checking actions of every module. */ -echo '-------------lang checking-----------------' . "\n"; -include '../module/common/lang/zh-cn.php'; -include '../config/config.php'; -foreach(glob($moduleRoot . '*') as $modulePath) -{ - unset($lang); - $moduleName = basename($modulePath); - $mainLangFile = $modulePath . '/lang/zh-cn.php'; - if(!file_exists($mainLangFile)) continue; - $mainLines = file($mainLangFile); - - foreach($config->langs as $langKey => $langName) - { - if($langKey == 'zh-cn' or $langKey == 'zh-tw') continue; - $langFile = $modulePath . '/lang/' . $langKey . '.php'; - if(!file_exists($langFile)) continue; - $lines = file($langFile); - foreach($mainLines as $lineNO => $line) - { - if(strpos($line, '$lang') === false) - { - //if($line != $lines[$lineNO]) echo $moduleName . ' ' . $langKey . ' ' . $lineNO . "\n"; - } - else - { - if(strpos($line, '=') !== false) - { - list($mainKey, $mainValue) = explode('=', $line); - list($key, $value) = explode('=', $lines[$lineNO]); - } - if((strpos($line, '=') === false and $line != $lines[$lineNO]) or trim($mainKey) != trim($key)) - { - $key = trim($key); - $lineNO = $lineNO + 1; - echo "module $moduleName need checking, command is:"; - echo " vim -O +$lineNO ../module/$moduleName/lang/zh-cn.php +$lineNO ../module/$moduleName/lang/en.php \n"; - break; - } - } - } - } - - foreach(glob($modulePath . '/ext/lang/zh-cn/*.php') as $extMainLangFile) - { - $extMainLines = file($extMainLangFile); - $extLangFile = basename($extMainLangFile); - $extEnFile = $modulePath . '/ext/lang/en/' . $extLangFile; - $extLines = file($extEnFile); - foreach($extMainLines as $lineNO => $line) - { - if(strpos($line, '$lang') === false) - { - //if($line != $lines[$lineNO]) echo $moduleName . ' ' . $langKey . ' ' . $lineNO . "\n"; - } - else - { - list($mainKey, $mainValue) = explode('=', $line); - list($key, $value) = explode('=', $extLines[$lineNO]); - if(trim($mainKey) != trim($key)) - { - $key = trim($key); - $lineNO = $lineNO + 1; - echo "module $moduleName need checking, command is:"; - echo " vim -O +$lineNO ../../module/$moduleName/ext/lang/zh-cn/$extLangFile +$lineNO ../../module/$moduleName/ext/lang/en/$extLangFile \n"; - break; - } - } - } - } -} - -echo '-------------php5.4 synatax checking-----------------' . "\n"; -class app {function loadLang() {}} -$app = new app; -$lang = new stdclass(); - -error_reporting(E_WARNING | E_STRICT ); -foreach(glob($moduleRoot . '*') as $modulePath) -{ - $moduleName = basename($modulePath); - $cnLangFile = $modulePath . '/lang/zh-cn.php'; - $enLangFile = $modulePath . '/lang/en.php'; - $configFile = $modulePath . '/config.php'; - - if(!isset($lang->$moduleName)) $lang->$moduleName = new stdclass(); - if(!isset($config->$moduleName)) $config->$moduleName = new stdclass(); - if(file_exists($cnLangFile)) include $cnLangFile; - if(file_exists($enLangFile)) include $enLangFile; - if(file_exists($configFile)) include $configFile; -} - -echo '-------------demo data checking. -----------------' . "\n"; -$demoSQL = file("../db/demo.sql"); -foreach($demoSQL as $line => $sql) -{ - if(strpos($sql, 'INSERT') === false) continue; - - if(strpos($sql, $config->db->prefix . 'config') !== false or - strpos($sql, $config->db->prefix . 'company') !== false or - strpos($sql, $config->db->prefix . 'group') !== false) - { - die('line ' . ($line + 1) . " has error\n"); - } -} diff --git a/tools/cn2tw.php b/tools/cn2tw.php deleted file mode 100755 index 8af43a45b4..0000000000 --- a/tools/cn2tw.php +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env php - $targetLangFile"); - $defaultLang = file_get_contents($targetLangFile); - $targetLang = str_replace('zh-cn', $langDesc, $defaultLang); - file_put_contents($targetLangFile, $targetLang); -} -?> diff --git a/tools/copylang.php b/tools/copylang.php deleted file mode 100755 index 8f7d1a34ce..0000000000 --- a/tools/copylang.php +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env php - diff --git a/tools/exportactions.php b/tools/exportactions.php deleted file mode 100755 index 3bf58bdd0b..0000000000 --- a/tools/exportactions.php +++ /dev/null @@ -1,29 +0,0 @@ -getMethods(); - foreach($methods as $method) - { - $methodRef = new ReflectionMethod($method->class, $method->name); - if($methodRef->isPublic() and strpos($method->name, '__') === false) - { - echo "\$lang['action']['$moduleName']['$method->name'] = '$method->name';\n"; - } - } - echo "\n"; - } - } -} -?> diff --git a/tools/getallcommon.php b/tools/getallcommon.php deleted file mode 100755 index 6bea6b1765..0000000000 --- a/tools/getallcommon.php +++ /dev/null @@ -1,28 +0,0 @@ - $maxLength) $maxLength = strlen($moduleName); -} - -foreach($modules as $modulePath) -{ - $moduleName = basename($modulePath); - if($moduleName == 'help' or $moduleName == 'editor') continue; - $langFile = $modulePath . "/lang/$langType.php"; - if(!file_exists($langFile)) continue; - include $langFile; - - $moduleTitle = ''; - if(isset($lang->$moduleName->common)) - { - $moduleTitle = $lang->$moduleName->common; - } - - echo "\$lang->editor->modules['$moduleName'] " . str_pad('', $maxLength - strlen($moduleName)) . "= '$moduleTitle';\n"; - -} diff --git a/tools/initext.php b/tools/initext.php deleted file mode 100755 index be9f06a725..0000000000 --- a/tools/initext.php +++ /dev/null @@ -1,73 +0,0 @@ - - * @package common - * @version $Id$ - * @link http://www.zentao.net - */ -include '../config/config.php'; - -$modules = array(); -$moduleRoot = realpath('../module/') . '/'; - -if(is_dir($moduleRoot)) -{ - if($dh = opendir($moduleRoot)) - { - while($module = readdir($dh)) - { - if(strpos(basename($module), '.') === false) $modules[] = $module; - } - closedir($dh); - } -} -else -{ - die("The module you input does not exist. \n"); -} - -foreach($modules as $module) -{ - /* 设定各个目录。*/ - $extRoot = $moduleRoot . DIRECTORY_SEPARATOR. $module . DIRECTORY_SEPARATOR . 'ext'; - $extControl = $extRoot . DIRECTORY_SEPARATOR . 'control'; - $extModel = $extRoot . DIRECTORY_SEPARATOR . 'model'; - $extView = $extRoot . DIRECTORY_SEPARATOR . 'view'; - $extCSS = $extRoot . DIRECTORY_SEPARATOR . 'css'; - $extJS = $extRoot . DIRECTORY_SEPARATOR . 'js'; - $extConfig = $extRoot . DIRECTORY_SEPARATOR . 'config'; - $extLang = $extRoot . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR; - - /* 建立各个扩展目录 */ - if(!file_exists($extRoot)) mkdir($extRoot, 0777); - if(!file_exists($extControl)) mkdir($extControl, 0777); - if(!file_exists($extModel)) mkdir($extModel, 0777); - if(!file_exists($extView)) mkdir($extView, 0777); - if(!file_exists($extCSS)) mkdir($extCSS, 0777); - if(!file_exists($extJS)) mkdir($extJS, 0777); - if(!file_exists($extConfig)) mkdir($extConfig, 0777); - if(!file_exists($extLang)) mkdir($extLang, 0777); - - /* Touch .gitkeep file. */ - touch($extControl . '/.gitkeep'); - touch($extModel . '/.gitkeep'); - touch($extView . '/.gitkeep'); - touch($extCSS . '/.gitkeep'); - touch($extJS . '/.gitkeep'); - touch($extConfig . '/.gitkeep'); - - /* 创建语言目录。*/ - $langs = array_keys($config->langs); - foreach($langs as $lang) - { - $langPath = $extLang . $lang; - if(!file_exists($langPath)) mkdir($langPath, 0777); - touch($langPath . '/.gitkeep'); - } - - echo "init $module ... \n"; -} diff --git a/tools/minifyfront.php b/tools/minifyfront.php deleted file mode 100755 index d8eaa75ead..0000000000 --- a/tools/minifyfront.php +++ /dev/null @@ -1,74 +0,0 @@ -productCommon = ''; -$lang->projectCommon = ''; -include $baseDir . '/module/common/lang/zh-cn.php'; -$langs = array_keys($config->langs); -$themes = array_keys($lang->themes); - -/* Create css files for every them and every lang. */ -$zuiCode = str_replace('../fonts', '../zui/fonts', file_get_contents($themeRoot . 'zui/css/min.css')); -foreach($langs as $lang) -{ - foreach($themes as $theme) - { - /* Common css files. */ - $cssCode = $zuiCode; - $cssCode .= file_get_contents($themeRoot . 'default/style.css'); - $cssCode .= file_get_contents($jqueryRoot . 'chosen/min.css'); - $cssCode .= file_get_contents($themeRoot . 'default/treeview.css'); - $cssCode .= file_get_contents($jqueryRoot . 'datetimepicker/min.css'); - - /* Css file for current lang and current them. */ - $cssCode .= file_get_contents($themeRoot . "lang/$lang.css"); - if($theme != 'default') - { - $themCode = file_get_contents($themeRoot . $theme . '/style.css'); - $cssCode .= str_replace('./images', "../$theme/images", $themCode); - } - - /* Combine them. */ - $cssFile = $themeRoot . "default/$lang.$theme.css"; - file_put_contents($cssFile, $cssCode); - - /* Compress it. */ - `java -jar ~/bin/yuicompressor/build/yuicompressor.jar --type css $cssFile -o $cssFile`; - } -} diff --git a/tools/preparetest.php b/tools/preparetest.php deleted file mode 100755 index bce62e92d7..0000000000 --- a/tools/preparetest.php +++ /dev/null @@ -1,60 +0,0 @@ - $database.sql;\n"; - $cmd .= "mysql -uroot $backupDatabase < $database.sql;\n"; - $cmd .= "rm -fr $database.sql"; - system($cmd); - } -} - -/* Restore stored backup databases. */ -function restore() -{ - global $databases; - foreach($databases as $database) - { - $backupDatabase = "back_$database"; - mysql_query("DROP DATABASE $database"); - mysql_query("CREATE DATABASE $database"); - $cmd = "mysqldump -u root $backupDatabase > $database.sql;\n"; - $cmd .= "mysql -uroot $database < $database.sql;\n"; - $cmd .= "rm -fr $database.sql"; - system($cmd); - } -} - -/* Connect to database. */ -function connectDB() -{ - global $config; - mysql_connect($config->db->host, $config->db->user, $config->db->password); -} diff --git a/tools/replace.sh b/tools/replace.sh deleted file mode 100755 index 8536f5eb8b..0000000000 --- a/tools/replace.sh +++ /dev/null @@ -1,17 +0,0 @@ -#replace title -foreachd(){ - for file in `ls $1` - do - if [ -d $1/$file ] - then - echo "into dir $1/$file" - foreachd $1/$file - elif [ -f $1/$file ] - then -# sed -i '1,11s/\@license.*$/\@license ZPL \(http:\/\/zpl\.pub\/page\/zplv11\.html\)/g' $1/$file - sed -i '1,11s/\@copyright.*$/\@copyright Copyright 2009-2015 青岛易软天创网络科技有限公司\(QingDao Nature Easy Soft Network Technology Co,LTD, www\.cnezsoft\.com\)/g' $1/$file - fi - done -} - -foreachd $1 diff --git a/tools/syncext.php b/tools/syncext.php deleted file mode 100755 index cad41b07ce..0000000000 --- a/tools/syncext.php +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env php - -# @author yidong wang -# - -# Judge the params, must give $src and $dest. -if [ $# -lt 2 ]; then - echo './syncext.sh src dest' - exit 1 -fi - -# Judge inotifywait tool exists or not. -which inotifywait > /dev/null -if [ $? -ne 0 ]; then - echo 'No inotifywait. Please install inotify-tools, for debian or ubuntun run apt-get install inotify-tools.'; - exit 1 -fi - -# Get $src and $dest. -src=$1/ -dest=$2/ - -# Rsync when the shell load first. -rsync -aqP --exclude="db/" $src $dest -echo `date "+%H:%M:%S"` sync $src to $dest succssfully. - -# Watch the $src directory, and sync files to destination. -inotifywait -mrq --event create,modify,delete,move --format '%w %e %f' $src |\ -while read watcher event file ; do - - # compute the $path2process. - path2process=$watcher$file - path2process=${path2process/$src/$dest} - - # Delete a file or a directory. - if [ "$event" == "DELETE" -o "$event" == "DELETE,ISDIR" ]; then - - # If delete a file, use rm -fr, directory, use rmdir for security. - if [ "$event" == "DELETE" ]; then - rm -fr $path2process - else - rmdir $path2process - fi - - echo `date "+%H:%M:%S"` $path2process deleted.; - - # If event is ngnored, continue. - elif [ "$event" == "IGNORED" ]; then - - continue - - # Sync files. - else - - echo `date "+%H:%M:%S"` $path2process copied. - rsync -aqP --exclude='db/' $src/ $dest - fi - -done diff --git a/tools/zdog.sh b/tools/zdog.sh deleted file mode 100755 index e0e6354df7..0000000000 --- a/tools/zdog.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Watch a upload directory and remove dangder files. -# -# @author chunsheng wang - -# Judge the params, must give $dir -if [ $# -lt 1 ]; then - echo './zdog.sh directory' - exit 1 -fi - -# Judge inotifywait tool exists or not. -which inotifywait > /dev/null -if [ $? -ne 0 ]; then - echo 'No inotifywait. Please install inotify-tools, for debian or ubuntun run apt-get install inotify-tools.'; - exit 1 -fi - -# Get the directory to watch. -dir=$@ - -# Watch the $dir directory -if [ ! -d "/tmp/zdog" ]; then - mkdir -v /tmp/zdog; -fi -echo `date "+%H:%M:%S"` begin watching $dir > /tmp/zdog/zdog.log -inotifywait -mrq --event create,modify --format '%w %e %f' $dir |\ -while read watcher event file ; do - - # compute the $path2process. - path2process=$watcher$file - targetfile=/tmp/zdog/$file; - echo $path2process | grep -q '.php'; - if [ $? -eq 0 ] && [ -s $path2process ]; then - sudo mv -f $path2process $targetfile; - echo `date "+%H:%M:%S"` $path2process moved to $targetfile >> /tmp/zdog/zdog.log 2>&1; - fi -done