* finish task #1578.

This commit is contained in:
wyd621
2013-07-18 14:17:06 +08:00
parent 337eadde8e
commit 012b5381ba
5 changed files with 2 additions and 9 deletions
+1
View File
@@ -1,2 +1,3 @@
ALTER TABLE `zt_extension` ADD `depends` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `installedTime` ;
ALTER TABLE `zt_extension` CHANGE `zentaoVersion` `zentaoCompatible` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
ALTER TABLE `zt_company` DROP `pms`;
-2
View File
@@ -96,7 +96,6 @@ class install extends control
$this->view->app = $this->app;
$this->view->lang = $this->lang;
$this->view->config = $this->config;
$this->view->domain = $this->server->HTTP_HOST;
$this->view->title = $this->lang->install->saveConfig;
$this->view->mysqldump = $this->install->getMySQLDump();
$this->display();
@@ -142,7 +141,6 @@ class install extends control
}
else
{
$this->view->pmsDomain = $this->server->HTTP_HOST;
$this->display();
}
}
+1 -2
View File
@@ -390,9 +390,8 @@ class installModel extends model
/* Insert a company. */
$company = new stdclass();
$company->name = $this->post->company;
$company->pms = $this->post->pms;
$company->admins = ",{$this->post->account},";
$this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->batchCheck('name, pms', 'notempty')->check('pms', 'unique')->exec();
$this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->batchCheck('name', 'notempty')->exec();
if(!dao::isError())
{
-1
View File
@@ -25,7 +25,6 @@ if(!isset($error))
\$config->db->password = '$dbPassword';
\$config->db->prefix = '$dbPrefix';
\$config->webRoot = getWebRoot();
\$config->default->domain = '$domain';
\$config->default->lang = '$defaultLang';
\$config->mysqldump = '$mysqldump';
EOT;
-4
View File
@@ -31,10 +31,6 @@
<th class='rowhead'><?php echo $lang->install->company;?></th>
<td><?php echo html::input('company');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->install->pms;?></th>
<td><?php echo html::input('pms', $pmsDomain) . "<span class='f-12px'>{$lang->install->pmsNote}</span>";?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->install->account;?></th>
<td><?php echo html::input('account');?></td>