<\/div><\/div>/g" zentaoxx/module/client/view/checkupgrade.html.php
- sed -i '/var serverVersions/d' zentaoxx/module/client/js/checkupgrade.js
- sed -i '/var currentVersion/d' zentaoxx/module/client/js/checkupgrade.js
- sed -i '/setRequiredFields(/d' zentaoxx/module/common/view/header.modal.html.php
- sed -i 's/header.html.php/header.lite.html.php/g' zentaoxx/module/common/view/header.modal.html.php
- sed -i 's/footer.html.php/footer.lite.html.php/g' zentaoxx/module/common/view/footer.modal.html.php
- sed -i 's/v\.//g' zentaoxx/module/im/js/debug.js
+ sed -i "/fetch('push', 'pushMessage');/d" zentaoxx/extension/xuan/im/control.php
+ #sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n
<\/div><\/div>/g" zentaoxx/extension/xuan/client/view/checkupgrade.html.php
+ sed -i '/var serverVersions/d' zentaoxx/extension/xuan/client/js/checkupgrade.js
+ sed -i '/var currentVersion/d' zentaoxx/extension/xuan/client/js/checkupgrade.js
+ sed -i '/setRequiredFields(/d' zentaoxx/extension/xuan/common/view/header.modal.html.php
+ sed -i 's/header.html.php/header.lite.html.php/g' zentaoxx/extension/xuan/common/view/header.modal.html.php
+ sed -i 's/footer.html.php/footer.lite.html.php/g' zentaoxx/extension/xuan/common/view/footer.modal.html.php
+ sed -i 's/v\.//g' zentaoxx/extension/xuan/im/js/debug.js
sed -i 's/helper::jsonEncode(/json_encode(/g' zentaoxx/framework/xuanxuan.class.php
- sed -i "s/lang->goback,/lang->goback, '',/g" zentaoxx/module/im/view/debug.html.php
- sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
- sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/module/im/control.php
- sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/module/im/model/conference.php
+ sed -i "s/lang->goback,/lang->goback, '',/g" zentaoxx/extension/xuan/im/view/debug.html.php
+ sed -i 's/v\.//g' zentaoxx/extension/xuan/client/js/checkupgrade.js
+ sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/extension/xuan/im/control.php
+ sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/extension/xuan/im/model/conference.php
sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
echo "ALTER TABLE \`zt_user\` ADD \`pinyin\` varchar(255) NOT NULL DEFAULT '' AFTER \`realname\`;" >> zentaoxx/db/xuanxuan.sql
mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
@@ -134,11 +141,12 @@ package:
chmod -R 777 zentaopms/tmp/
chmod -R 777 zentaopms/www/data
chmod -R 777 zentaopms/config
+ chmod -R 777 zentaopms/extension/custom
chmod 777 zentaopms/module
chmod 777 zentaopms/www
chmod a+rx zentaopms/bin/*
if [ ! -d "zentaopms/config/ext" ]; then mkdir zentaopms/config/ext; fi
- for module in `ls zentaopms/module/`; do if [ ! -d "zentaopms/module/$$module/ext" ]; then mkdir zentaopms/module/$$module/ext; fi done
+ for module in `ls zentaopms/module/`; do if [ -d "zentaopms/module/$$module" ] && [ ! -d "zentaopms/module/$$module/ext" ]; then mkdir zentaopms/module/$$module/ext; fi done
find zentaopms/ -name ext |xargs chmod -R 777
mkdir zentaopms/tools; cp tools/cn2tw.php zentaopms/tools; cd zentaopms/tools; php cn2tw.php
#rm -r zentaopms/module/misc/ext
@@ -152,78 +160,13 @@ pms:
make package
zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
rm -fr zentaopms zentaoxx zentaoxx.*.zip
-deb:
- mkdir buildroot
- cp -r build/debian/DEBIAN buildroot
- sed -i '/^Version/cVersion: ${VERSION}' buildroot/DEBIAN/control
- mkdir buildroot/opt
- mkdir buildroot/etc/apache2/sites-enabled/ -p
- cp build/debian/zentaopms.conf buildroot/etc/apache2/sites-enabled/
- 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
- rm -rf buildroot
-rpm:
- mkdir ~/rpmbuild/SPECS -p
- cp build/rpm/zentaopms.spec ~/rpmbuild/SPECS
- sed -i '/^Version/cVersion:${VERSION}' ~/rpmbuild/SPECS/zentaopms.spec
- mkdir ~/rpmbuild/SOURCES
- cp ZenTaoPMS.${VERSION}.zip ~/rpmbuild/SOURCES
- mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p
- cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/
- mkdir ~/rpmbuild/SOURCES/opt/ -p
- cd ~/rpmbuild/SOURCES; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms opt/zentao;
- sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/opt/zentao/www/.htaccess
- cd ~/rpmbuild/SOURCES; tar -czvf zentaopms-${VERSION}.tar.gz etc opt; rm -rf ZenTaoPMS.${VERSION}.zip etc opt;
- rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
- cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./
- rm -rf ~/rpmbuild
-en:
+ci:
make common
- cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g';
- cd zentaopms/; grep -rl 'http://www.zentao.pm'|xargs sed -i 's/http:\/\/www.zentao.pm/https:\/\/www.zentao.pm/g';
- cd zentaopms/config/; echo >> config.php; echo '$$config->isINT = true;' >> config.php
+ make zentaoxx
+ unzip zentaoxx.*.zip
+ cp zentaoxx/* zentaopms/ -r
+ cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
make package
- mv zentaopms zentaoalm
- zip -r -9 ZenTaoALM.$(VERSION).int.zip zentaoalm
- rm -fr zentaoalm
- echo $(VERSION).int > VERSION
- make endeb
- make enrpm
- echo $(VERSION) > VERSION
-endeb:
- mkdir buildroot
- cp -r build/debian/DEBIAN buildroot
- sed -i '/^Version/cVersion: ${VERSION}' buildroot/DEBIAN/control
- mkdir buildroot/opt
- mkdir buildroot/etc/apache2/sites-enabled/ -p
- cp build/debian/zentaopms.conf buildroot/etc/apache2/sites-enabled/
- cp ZenTaoALM.${VERSION}.zip buildroot/opt
- cd buildroot/opt; unzip ZenTaoALM.${VERSION}.zip; mv zentaoalm zentao; rm ZenTaoALM.${VERSION}.zip
- sed -i 's/index.php/\/zentao\/index.php/' buildroot/opt/zentao/www/.htaccess
- sudo dpkg -b buildroot/ ZenTaoALM_${VERSION}_1_all.deb
- rm -rf buildroot
-enrpm:
- mkdir ~/rpmbuild/SPECS -p
- cp build/rpm/zentaopms.spec ~/rpmbuild/SPECS
- sed -i '/^Version/cVersion:${VERSION}' ~/rpmbuild/SPECS/zentaopms.spec
- sed -i '/^Name:/cName:zentaoalm' ~/rpmbuild/SPECS/zentaopms.spec
- mkdir ~/rpmbuild/SOURCES
- cp ZenTaoALM.${VERSION}.zip ~/rpmbuild/SOURCES
- mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p
- cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/zentaoalm.conf
- mkdir ~/rpmbuild/SOURCES/opt/ -p
- cd ~/rpmbuild/SOURCES; unzip ZenTaoALM.${VERSION}.zip; mv zentaoalm opt/zentao;
- sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/opt/zentao/www/.htaccess
- cd ~/rpmbuild/SOURCES; tar -czvf zentaoalm-${VERSION}.tar.gz etc opt; rm -rf ZenTaoALM.${VERSION}.zip etc opt;
- rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
- cp ~/rpmbuild/RPMS/noarch/zentaoalm-${VERSION}-1.noarch.rpm ./
- rm -rf ~/rpmbuild
-patchphpdoc:
- sudo cp misc/doc/phpdoc/*.tpl /usr/share/php/data/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/
-phpdoc:
- phpdoc -d bin,framework,config,lib,module,www -t api -o HTML:frames:phphtmllib -ti ZenTaoPMSAPI参考手册 -s on -pp on -i *test*
- phpdoc -d bin,framework,config,lib,module,www -t api.chm -o chm:default:default -ti ZenTaoPMSAPI参考手册 -s on -pp on -i *test*
-doxygen:
- doxygen doc/doxygen/doxygen.conf
+ if [ -d $(BUILD_PATH)/zentaopms ]; then rm -r $(BUILD_PATH)/zentaopms; fi
+ mv zentaopms $(BUILD_PATH)
+ rm -fr zentaopms zentaoxx zentaoxx.*.zip
diff --git a/db/update16.4.sql b/db/update16.4.sql
index dfd7d07147..2f2265fb9c 100644
--- a/db/update16.4.sql
+++ b/db/update16.4.sql
@@ -23,4 +23,4 @@ ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL AFTER `closedReason
ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEditedDate`;
ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`;
-UPDATE `zt_user` SET `visions`='rnd,lite';
\ No newline at end of file
+UPDATE `zt_user` SET `visions`='rnd,lite';
diff --git a/db/zentao.sql b/db/zentao.sql
index 8a91be5022..06102bbea8 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1611,6 +1611,7 @@ CREATE TABLE IF NOT EXISTS `zt_user` (
`strategy` text NOT NULL,
`join` date NOT NULL default '0000-00-00',
`visits` mediumint(8) unsigned NOT NULL default '0',
+ `visions` varchar(20) NOT NULL,
`ip` char(15) NOT NULL default '',
`last` int(10) unsigned NOT NULL default '0',
`fails` tinyint(5) NOT NULL default '0',
diff --git a/extension/lite/execution/ext/view/edit.lite.html.hook.php b/extension/lite/execution/ext/view/edit.lite.html.hook.php
index 8912d09575..74ed9829f9 100644
--- a/extension/lite/execution/ext/view/edit.lite.html.hook.php
+++ b/extension/lite/execution/ext/view/edit.lite.html.hook.php
@@ -1,4 +1,6 @@
+app->getClientLang() . '/lite.php';?>