* Modify the issue of feature review.
This commit is contained in:
tianshujie
@@ -352,7 +352,7 @@ class control extends baseControl
|
||||
*/
|
||||
public function checkRequireFlowField()
|
||||
{
|
||||
if(!isset($this->config->bizVersion)) return false;
|
||||
if($this->config->edition != 'biz') return false;
|
||||
if(empty($_POST)) return false;
|
||||
|
||||
$flow = $this->dao->select('*')->from(TABLE_WORKFLOW)->where('module')->eq($this->moduleName)->fetch();
|
||||
|
||||
+12
-22
@@ -702,11 +702,11 @@ class upgrade extends control
|
||||
*
|
||||
* @param string $fromVersion
|
||||
* @param string $processed
|
||||
* @param string $skipConfirm
|
||||
* @param string $skipMoveFile
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function afterExec($fromVersion, $processed = 'no', $skipConfirm = 'no')
|
||||
public function afterExec($fromVersion, $processed = 'no', $skipMoveFile = 'no')
|
||||
{
|
||||
$alterSQL = $this->upgrade->checkConsistency($this->config->version);
|
||||
if(!empty($alterSQL))
|
||||
@@ -717,7 +717,7 @@ class upgrade extends control
|
||||
}
|
||||
|
||||
$EXTfiles = $this->upgrade->getEXTFiles();
|
||||
if(!empty($EXTfiles) and $skipConfirm == 'no') $this->locate(inlink('confirmCustom', "fromVersion=$fromVersion"));
|
||||
if(!empty($EXTfiles) and $skipMoveFile == 'no') $this->locate(inlink('moveEXTFiles', "fromVersion=$fromVersion"));
|
||||
unset($_SESSION['user']);
|
||||
|
||||
if($processed == 'no')
|
||||
@@ -867,20 +867,6 @@ class upgrade extends control
|
||||
echo $this->dao->select('status')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch('status');
|
||||
}
|
||||
|
||||
/**
|
||||
* Confirm custom.
|
||||
*
|
||||
* @param string $fromVersion
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function confirmCustom($fromVersion)
|
||||
{
|
||||
$this->view->fromVersion = $fromVersion;
|
||||
|
||||
$this->display();
|
||||
}
|
||||
|
||||
/**
|
||||
* Move Extent files.
|
||||
*
|
||||
@@ -895,13 +881,16 @@ class upgrade extends control
|
||||
$result = 'success';
|
||||
if(!empty($_POST))
|
||||
{
|
||||
$response = $this->upgrade->moveEXTFiles();
|
||||
$result = $response['result'];
|
||||
|
||||
if($result == 'success')
|
||||
if(!empty($_POST['files']))
|
||||
{
|
||||
$response = $this->upgrade->removeChargeDir();
|
||||
$response = $this->upgrade->moveEXTFiles();
|
||||
$result = $response['result'];
|
||||
|
||||
if($result == 'success')
|
||||
{
|
||||
$response = $this->upgrade->removeChargeDir();
|
||||
$result = $response['result'];
|
||||
}
|
||||
}
|
||||
|
||||
if($result == 'fail')
|
||||
@@ -913,6 +902,7 @@ class upgrade extends control
|
||||
if($result == 'success') $this->locate($this->inlink('afterExec', "fromVersion=$fromVersion&processed=no&skipConfirm=yes"));
|
||||
}
|
||||
|
||||
$this->view->title = $this->lang->upgrade->common;
|
||||
$this->view->files = $this->upgrade->getEXTFiles();
|
||||
$this->view->result = $result;
|
||||
$this->view->errorMessage = $errorMessage;
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
.modal-dialog {margin-top: 15%;}
|
||||
.modal-header {border-bottom: 0px;}
|
||||
.modal-footer {border-top: 0px;}
|
||||
@@ -1,4 +1,4 @@
|
||||
.modal-dialog {margin-top: 10px;}
|
||||
.modal-dialog {margin-top: 10px; width: 864px;}
|
||||
.modal-header {padding-bottom: 10px;}
|
||||
.modal-body {overflow-y: scroll;}
|
||||
@media screen and (max-width: 1920px) {.modal-body {height:500px}}
|
||||
@@ -7,3 +7,4 @@
|
||||
.modal-body .panel-heading {padding: 0px;}
|
||||
.modal-body #collapseOne {margin-left: 20px;}
|
||||
.alert {padding: 5px; margin-top: 5px !important;}
|
||||
.alert > p {font-size: 10px;}
|
||||
|
||||
@@ -113,11 +113,9 @@ $lang->upgrade->end = 'End Date';
|
||||
$lang->upgrade->selectProject = 'The target project';
|
||||
$lang->upgrade->programName = 'Program Name';
|
||||
$lang->upgrade->projectName = 'Project Name';
|
||||
$lang->upgrade->moveEXTFiles = 'Migrate Expansion Files';
|
||||
$lang->upgrade->compatibleEXT = 'Extension mechanism compatible';
|
||||
$lang->upgrade->fileName = 'File Name';
|
||||
$lang->upgrade->next = 'Next';
|
||||
$lang->upgrade->yes = 'Yes';
|
||||
$lang->upgrade->no = 'No';
|
||||
|
||||
$lang->upgrade->newProgram = 'Create';
|
||||
$lang->upgrade->editedName = 'New Name';
|
||||
@@ -133,8 +131,11 @@ $lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data ta
|
||||
$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names.";
|
||||
$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware.";
|
||||
$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!';
|
||||
$lang->upgrade->confirmCustomTip = 'Please confirm whether customization or secondary development has been done';
|
||||
$lang->upgrade->moveExtFileTip = 'The following files will be migrated to zentaopms/extension/custom';
|
||||
$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.';
|
||||
$lang->upgrade->moveExtFileTip = <<<EOT
|
||||
<p>The new version will be compatible with the extension mechanism of the historical customization/plug-in. You need to migrate the customization/plug-in related files to zentaopms/extension/custom, otherwise the customization/plug-in function will not be available.</p>
|
||||
<p>Please confirm whether the system has been customized/plug-in. If no customization/plug-in has been done, you can uncheck the following files; Whether you have done customization/plug-in, you can also keep the file checked.</p>
|
||||
EOT;
|
||||
|
||||
$lang->upgrade->projectType['project'] = "Upgrade the historical {$lang->projectCommon} as a project";
|
||||
$lang->upgrade->projectType['execution'] = "Upgrade the historical {$lang->projectCommon} as an execution";
|
||||
|
||||
@@ -113,11 +113,9 @@ $lang->upgrade->end = '结束日期';
|
||||
$lang->upgrade->selectProject = '目标项目';
|
||||
$lang->upgrade->programName = '项目集名称';
|
||||
$lang->upgrade->projectName = '项目名称';
|
||||
$lang->upgrade->moveEXTFiles = '迁移插件文件';
|
||||
$lang->upgrade->compatibleEXT = '扩展机制兼容';
|
||||
$lang->upgrade->fileName = '文件名称';
|
||||
$lang->upgrade->next = '下一步';
|
||||
$lang->upgrade->yes = '是';
|
||||
$lang->upgrade->no = '否';
|
||||
|
||||
$lang->upgrade->newProgram = '新建';
|
||||
$lang->upgrade->editedName = '调整后名称';
|
||||
@@ -133,8 +131,11 @@ $lang->upgrade->errorEngineInnodb = '您当前的数据库不支持使用InnoDB
|
||||
$lang->upgrade->duplicateProject = "同一个项目集内项目名称不能重复，请调整重名的项目名称";
|
||||
$lang->upgrade->upgradeTips = "历史删除数据不参与升级，升级后将不支持还原，请知悉";
|
||||
$lang->upgrade->moveEXTFileFail = '迁移文件失败， 请执行上面命令后刷新！';
|
||||
$lang->upgrade->confirmCustomTip = '请确认是否做过定制或二次开发';
|
||||
$lang->upgrade->moveExtFileTip = '如下文件将会迁移到zentaopms/extension/custom下';
|
||||
$lang->upgrade->deleteDirTip = '升级后，如下文件夹会影响系统功能的使用，请删除。';
|
||||
$lang->upgrade->moveExtFileTip = <<<EOT
|
||||
<p>新版本将对历史的定制/插件进行扩展机制兼容处理，需要将定制/插件相关的文件迁移到zentaopms/extension/custom下，否则定制/插件功能将无法使用。</p>
|
||||
<p>请您确认系统是否有做过定制/插件，如没有做过定制/插件，可取消勾选如下文件；如果不清楚是否做过定制/插件，也可保持文件勾选。</p>
|
||||
EOT;
|
||||
|
||||
$lang->upgrade->projectType['project'] = "把历史的{$lang->projectCommon}作为项目升级";
|
||||
$lang->upgrade->projectType['execution'] = "把历史的{$lang->projectCommon}作为执行升级";
|
||||
|
||||
@@ -5816,7 +5816,7 @@ class upgradeModel extends model
|
||||
/* Determine whether the current file is encrypted. */
|
||||
if(strpos($line, "extension_loaded('ionCube Loader')") === false)
|
||||
{
|
||||
$maxFiles = file_get_contents('maxfiles.php');
|
||||
$maxFiles = file_get_contents('maxfiles.txt');
|
||||
if(strpos($maxFiles, $fileName) !== false) continue;
|
||||
|
||||
$files[$fileName] = $fileName;
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* The confirmcustom view file of upgrade module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Shujie Tian <tianshujie@cnezsoft.com>
|
||||
* @package upgrade
|
||||
* @version $Id: confirmcustom.html.php 4129 2022-02-23 10:20:14Z $
|
||||
*/
|
||||
?>
|
||||
<?php include '../../common/view/header.lite.html.php';?>
|
||||
<div class='container'>
|
||||
<form method='post' action='<?php echo inlink('moveEXTFiles', "fromVersion=$fromVersion");?>'>
|
||||
<div class='modal-dialog'>
|
||||
<div class='modal-header'>
|
||||
<strong><?php echo $lang->upgrade->confirmCustomTip;?></strong>
|
||||
</div>
|
||||
<div class='modal-footer'>
|
||||
<?php echo html::submitButton($lang->upgrade->yes);?>
|
||||
<?php echo html::a(inlink('afterExec', "fromVersion=$fromVersion&processed=no&skipConfirm=yes"), $lang->upgrade->no, '', "class='btn btn-back btn-wide'");?>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.lite.html.php';?>
|
||||
@@ -14,9 +14,11 @@
|
||||
<form method='post' action="<?php echo $this->createLink('upgrade', 'moveEXTFiles', "fromVersion=$fromVersion");?>">
|
||||
<div class='modal-dialog'>
|
||||
<div class='modal-header'>
|
||||
<strong><?php echo $lang->upgrade->moveEXTFiles;?></strong>
|
||||
<strong><?php echo $lang->upgrade->compatibleEXT;?></strong>
|
||||
<?php if($result == 'success'):?>
|
||||
<div class='alert alert-info no-margin'><?php echo $lang->upgrade->moveExtFileTip?></div>
|
||||
<?php elseif($result == 'fail' and is_array($command)):?>
|
||||
<div class='alert alert-info no-margin'><?php echo $lang->upgrade->deleteDirTip?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<div class='modal-body'>
|
||||
@@ -43,6 +45,7 @@
|
||||
<div class='modal-footer text-center'>
|
||||
<?php if($result == 'success') echo html::submitButton($lang->upgrade->next);?>
|
||||
<?php if($result == 'fail') echo $errorMessage . ' ' . html::a('#', $this->lang->refresh, '', "class='btn btn-sm' onclick='refreshPage()'");?></div>
|
||||
<?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user