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

* code for task #6566.

Browse Source
This commit is contained in:
wangyidong
2019-11-21 16:49:08 +08:00
parent c0e0423c09
commit 2d500ae75c
1 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+57 -31
View File
@@ -535,9 +535,10 @@ class upgradeModel extends model
$this->saveLogs('Execute 11_6_5');
$this->execSQL($this->getUpgradeFile('11.6.5'));
$this->fixGroupAcl();
$this->appendExec('11_6_5');
case '11_6_6':
$this->fixBugTypeList();
$this->adjustPriv11_6_6();
$this->rmEditorAndTranslateDir();
$this->appendExec('11_6_5');
}
$this->deletePatch();
@@ -687,6 +688,7 @@ class upgradeModel extends model
case '11_6_2' :
case '11_6_3' :
case '11_6_4' : $confirmContent .= file_get_contents($this->getUpgradeFile('11.6.4'));
case '11_6_5' : $confirmContent .= file_get_contents($this->getUpgradeFile('11.6.5'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
@@ -3458,35 +3460,6 @@ class upgradeModel extends model
return true;
}
/**
* Save Logs.
*
* @param string $log
* @access public
* @return void
*/
public function saveLogs($log)
{
$logFile = $this->app->getTmpRoot() . 'log/upgrade.' . date('Ymd') . '.log.php';
$log = date('Y-m-d H:i:s') . ' ' . trim($log) . "\n";
if(!file_exists($logFile)) $log = "<?php\ndie();\n?" . ">\n" . $log;
static $fh;
if(empty($fh)) $fh = fopen($logFile, 'a');
fwrite($fh, $log);
}
/**
* Append execute for pro and biz.
*
* @param string $fromVersion
* @access public
* @return void
*/
public function appendExec($zentaoVersion)
{
}
/**
* Fix bug typeList.
*
@@ -3495,6 +3468,8 @@ class upgradeModel extends model
*/
public function fixBugTypeList()
{
$this->saveLogs('Run Method ' . __FUNCTION__);
foreach($this->config->upgrade->discardedBugTypes as $langCode => $types)
{
$bugs = $this->dao->select('type')->from(TABLE_BUG)->where('type')->in(array_keys($types))->fetchAll('type');
@@ -3530,4 +3505,55 @@ class upgradeModel extends model
}
return true;
}
/**
* Remove editor and translate.
*
* @access public
* @return bool
*/
public function rmEditorAndTranslateDir()
{
$this->saveLogs('Run Method ' . __FUNCTION__);
$zfile = $this->app->loadClass('zfile');
$moduleRoot = $this->app->getModuleRoot();
$editorDir = $moduleRoot . 'editor';
if(is_dir($editor)) $zfile->removeDir($editorDir);
$translateDir = $moduleRoot . 'translate';
if(is_dir($translateDir)) $zfile->removeDir($translateDir);
return true;
}
/**
* Save Logs.
*
* @param string $log
* @access public
* @return void
*/
public function saveLogs($log)
{
$logFile = $this->app->getTmpRoot() . 'log/upgrade.' . date('Ymd') . '.log.php';
$log = date('Y-m-d H:i:s') . ' ' . trim($log) . "\n";
if(!file_exists($logFile)) $log = "<?php\ndie();\n?" . ">\n" . $log;
static $fh;
if(empty($fh)) $fh = fopen($logFile, 'a');
fwrite($fh, $log);
}
/**
* Append execute for pro and biz.
*
* @param string $fromVersion
* @access public
* @return void
*/
public function appendExec($zentaoVersion)
{
}
}