Merge branch 'cyy_fixbug' into 'master'

Cyy fixbug

See merge request easycorp/zentaopms!7433

module/install/control.php

@@ -296,12 +296,13 @@ class install extends control
      */
     public function step6()
     {
-        $installFileDeleted = unlink($this->app->getAppRoot() . 'www/install.php');
+        $canDelFile = is_writable($this->app->getAppRoot() . 'www');
+        $installFileDeleted = $canDelFile ? unlink($this->app->getAppRoot() . 'www/install.php') : false;
         $this->view->installFileDeleted = $installFileDeleted;
         $this->view->title              = $this->lang->install->success;
         $this->display();
 
-        unlink($this->app->getAppRoot() . 'www/upgrade.php');
+        if($canDelFile) unlink($this->app->getAppRoot() . 'www/upgrade.php');
         unset($_SESSION['installing']);
         session_destroy();
     }

module/install/lang/zh-cn.php

@@ -121,7 +121,7 @@ $lang->install->chmodLinux   = '需要修改目录 "%s" 的权限。<br />命令
 
 $lang->install->timezone       = '时区设置';
 $lang->install->defaultLang    = '默认语言';
-$lang->install->dbDriver       = 'Database Driver';
+$lang->install->dbDriver       = '数据库类型';
 $lang->install->dbHost         = '数据库服务器';
 $lang->install->dbHostNote     = '如果127.0.0.1无法访问，尝试使用localhost';
 $lang->install->dbPort         = '服务器端口';

module/program/model.php

@@ -1669,7 +1669,7 @@ class programModel extends model
         if($program) return $program->id;
 
         $account  = isset($this->app->user->account) ? $this->app->user->account : '';
-        $minBegin = $this->dao->select('min(begin) as min')->from(TABLE_PROJECT)->where('deleted')->eq(0)->fetch('min');
+        $minBegin = $this->dao->select('min(`begin`) as min')->from(TABLE_PROJECT)->where('deleted')->eq(0)->fetch('min');
 
         $program = new stdclass();
         $program->name          = $this->lang->program->defaultProgram;