diff --git a/.gitignore b/.gitignore index 8b5ad3eb44..5529453cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ config/my.php www/data/ www/install.php www/upgrade.php +www/ok.txt tools/* release/* tmp/* @@ -11,3 +12,4 @@ tmp/model/* tmp/cache/* tmp/extension/* .gitkeep +.bak diff --git a/Makefile b/Makefile index e7f6d0ebde..9edf82cf88 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ pms: cp -fr module zentaopms/ cp -fr www zentaopms && rm -fr zentaopms/www/data/ && mkdir -p zentaopms/www/data/upload cp -fr tmp zentaopms + mv zentaopms/www/install.php.tmp zentaopms/www/install.php + mv zentaopms/www/upgrade.php.tmp zentaopms/www/upgrade.php rm -fr zentaopms/tmp/cache/* rm -fr zentaopms/tmp/extension/* rm -fr zentaopms/tmp/log/* diff --git a/VERSION b/VERSION index 56b6be4ebb..cb90e90fa9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.3.1 +9.0.stable diff --git a/bin/ztcli b/bin/ztcli index d6f4fd96ad..027219cfa1 100755 --- a/bin/ztcli +++ b/bin/ztcli @@ -27,8 +27,8 @@ include './framework/router.class.php'; include './framework/control.class.php'; include './framework/model.class.php'; include './framework/helper.class.php'; -include './config/config.php'; - +include realpath('./config/config.php'); + /* Set the PATH_INFO variable. */ if($config->requestType == 'PATH_INFO') { @@ -52,6 +52,8 @@ if($config->requestType == 'PATH_INFO') $_SERVER['PATH_INFO'] = '/'; } } + + $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO']; } else { diff --git a/config/config.php b/config/config.php index b1df1f5794..1c264e9944 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '8.3.1'; // The version of zentaopms. Don't change it. +$config->version = '9.0'; // The version of zentaopms. Don't change it. $config->charset = 'UTF-8'; // The charset of zentaopms. $config->cookieLife = time() + 2592000; // The cookie life time. $config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php @@ -31,7 +31,7 @@ $config->requestFix = '-'; // The divider in the url when PATH_IN $config->moduleVar = 'm'; // requestType=GET: the module var name. $config->methodVar = 'f'; // requestType=GET: the method var name. $config->viewVar = 't'; // requestType=GET: the view var name. -$config->sessionVar = 'sid'; // requestType=GET: the session var name. +$config->sessionVar = 'zentaosid'; // requestType=GET: the session var name. $config->allowedTags = '


    - +
    -
    - -
    +
    moduleName . ucfirst($this->methodName); @@ -148,14 +150,16 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows $withSearch = count($modules) > 8; echo "
    '; } else { @@ -178,7 +182,8 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows $withSearch = count($builds) > 4; echo "
    '; } else { @@ -210,15 +216,16 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); echo "