diff --git a/Makefile b/Makefile index 2dd791442a..cb782c8d7d 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,9 @@ common: mv zentaopms/www/install.php.tmp zentaopms/www/install.php mv zentaopms/www/upgrade.php.tmp zentaopms/www/upgrade.php cp VERSION zentaopms/ + # create index.html of each folder. + for path in `find zentaopms/ -type d`; do touch "$$path/index.html"; done + rm zentaopms/www/index.html # combine js and css files. cp -fr tools zentaopms/tools && cd zentaopms/tools/ && php ./minifyfront.php rm -fr zentaopms/tools diff --git a/VERSION b/VERSION index 1baf6d5a83..ee5d7542cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.4 +11.6.5 diff --git a/build/debian/DEBIAN/control b/build/debian/DEBIAN/control index 7a38de52c5..22238f9369 100644 --- a/build/debian/DEBIAN/control +++ b/build/debian/DEBIAN/control @@ -3,8 +3,8 @@ Version: 6.1 Section: utils Priority: optional Architecture: all -Depends: apache2, libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, php5-cli, php5-common, php5-mysql, php5-json, php5-ldap, mysql-server -Recommends: php5-gd +Depends: apache2, libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php, php-cli, php-common, php-mysql, php-json, php-ldap, mysql-server +Recommends: php-gd Installed-Size: 512 Maintainer: [url=www.zentao.net] Description: zentaopms diff --git a/config/config.php b/config/config.php index e0b26cde6c..c22ae36004 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '11.6.4'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '11.6.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/config/filter.php b/config/filter.php index 26f62f5ca2..2fb1c193d3 100644 --- a/config/filter.php +++ b/config/filter.php @@ -45,7 +45,6 @@ $filter->mail = new stdclass(); $filter->user = new stdclass(); $filter->block = new stdclass(); $filter->file = new stdclass(); -$filter->translate = new stdclass(); $filter->block->default = new stdclass(); $filter->block->main = new stdclass(); @@ -62,7 +61,6 @@ $filter->mail->ztcloud = new stdclass(); $filter->mail->batchdelete = new stdclass(); $filter->misc->checkupdate = new stdclass(); $filter->file->download = new stdclass(); -$filter->file->ajaxueditorupload = new stdclass(); $filter->product->browse = new stdclass(); $filter->product->default = new stdclass(); $filter->product->index = new stdclass(); @@ -184,7 +182,6 @@ $filter->doc->showfiles->get['recPerPage'] = 'int'; $filter->doc->showfiles->get['recTotal'] = 'int'; $filter->doc->showfiles->get['title'] = 'reg::any'; -$filter->file->ajaxueditorupload->get['action'] = 'equal::config'; $filter->file->download->get['charset'] = 'reg::lang'; $filter->mail->batchdelete->get['idList'] = 'reg::idList'; @@ -215,5 +212,3 @@ $filter->git->cat->get['repoUrl'] = 'reg::base64'; $filter->git->diff->get['repoUrl'] = 'reg::base64'; $filter->svn->cat->get['repoUrl'] = 'reg::base64'; $filter->svn->diff->get['repoUrl'] = 'reg::base64'; - -$filter->translate->module->cookie['translateView'] = 'equal::split'; diff --git a/config/zentaopms.php b/config/zentaopms.php index a5f8f0a6aa..d047cf9d26 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -13,6 +13,7 @@ /* Framework settings. */ $config->framework->autoRepairTable = true; $config->framework->autoLang = false; +$config->framework->filterCSRF = false; /* Upload settings. */ $config->allowedTags = '