Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

- remove the default domain setting from main config file.

Browse Source
This commit is contained in:
wangchunsheng
2010-01-26 03:13:55 +00:00
parent efaf711688
commit 8d09c6e54f
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/config/config.php
View File

@@ -44,7 +44,6 @@ $config->default->lang = 'zh-cn'; // Ĭ
$config->default->theme = 'default'; // Ĭ<>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD>⡣
$config->default->module = 'index'; // Ĭ<>ϵ<EFBFBD>ģ<EFBFBD>顣<EFBFBD><E9A1A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ָ<EFBFBD><D6B8>ģ<EFBFBD><C4A3>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>ظ<EFBFBD>ģ<EFBFBD>顣
$config->default->method = 'index'; // Ĭ<>ϵķ<CFB5><C4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ķ<EFBFBD><C4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>ø÷<C3B8><C3B7><EFBFBD><EFBFBD><EFBFBD>
$config->default->domain = 'pms.easysoft.com'; // Ĭ<>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ж<EFBFBD>Ӧ<EFBFBD>ļ<EFBFBD>¼ʱ<C2BC><CAB1>ʹ<EFBFBD>ô<EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>Ĺ<EFBFBD>˾<EFBFBD><CBBE>Ϣ<EFBFBD><CFA2>
$config->file->dangers = 'php,jsp,py,rb,asp,'; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD><D0B1><EFBFBD>
$config->file->maxSize = 1024 * 1024; // <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD>λΪ<CEBB>ֽڡ<D6BD>
@@ -57,6 +56,7 @@ $config->db->encoding = 'UTF8'; //
/* <20><><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>*/
$myConfig = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'my.php';
if(file_exists($myConfig)) include $myConfig;
if(!isset($config->db->prefix)) $config->db->prefix = 'zt_';
/* <20><><EFBFBD>ݱ<EFBFBD><DDB1>Ķ<EFBFBD><C4B6>塣*/
define('TABLE_ACTION', $config->db->prefix . 'action');

2
trunk/module/common/control.php
View File

@@ -304,7 +304,7 @@ EOT;
else
{
$company = $this->company->getByDomain();
if(!$company) $company = $this->company->getByDomain($this->config->default->domain);
if(!$company and isset($this->config->default->domain)) $company = $this->company->getByDomain($this->config->default->domain);
if(!$company) $this->app->error(sprintf($this->lang->error->companyNotFound, $_SERVER['HTTP_HOST']), __FILE__, __LINE__, $exit = true);
$_SESSION['company'] = $company;
$this->app->company = $company;

1
trunk/module/install/control.php
View File

@@ -74,6 +74,7 @@ class install extends control
$this->view = (object)$_POST;
$this->view->lang = $this->lang;
$this->view->config = $this->config;
$this->view->domain = $this->server->HTTP_HOST;
$this->view->header->title = $this->lang->install->saveConfig;
$this->display();
}

21
trunk/module/install/view/step3.html.php
View File

@@ -27,16 +27,17 @@ if(!isset($error))
{
$configContent = <<<EOT
<?php
\$config->installed = true; //标志是否已经安装。
\$config->debug = true; //是否打开debug功能。
\$config->webRoot = '$webRoot'; //web网站的根目录。
\$config->requestType = '$requestType'; //如何获取当前请求的信息，可选值：PATH_INFO|GET
\$config->db->host = '$dbHost'; //mysql主机。
\$config->db->port = '$dbPort'; //mysql主机端口号。
\$config->db->name = '$dbName'; //数据库名称。
\$config->db->user = '$dbUser'; //数据库用户名。
\$config->db->password = '$dbPassword'; //密码。
\$config->db->prefix = '$dbPrefix'; //表前缀。
\$config->installed = true; //标志是否已经安装。
\$config->debug = true; //是否打开debug功能。运行没有问题之后，可以将其改为false。
\$config->requestType = '$requestType'; //如何获取当前请求的信息，可选值：PATH_INFO|GET。
\$config->db->host = '$dbHost'; //mysql主机。
\$config->db->port = '$dbPort'; //mysql主机端口号。
\$config->db->name = '$dbName'; //数据库名称。
\$config->db->user = '$dbUser'; //数据库用户名。
\$config->db->password = '$dbPassword'; //密码。
\$config->db->prefix = '$dbPrefix'; //表前缀。
\$config->webRoot = '{$this->post->webRoot}'; //web网站的根目录。如果后面pms的目录有变化，需要修改此选项。
\$config->default->domain = '$domain'; //默认域名。
EOT;
}
?>