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

* finish task #2703.

Browse Source
This commit is contained in:
wangyidong
2016-12-02 10:30:46 +08:00
parent bbd2052dc7
commit 65940b16b8
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2
View File
@@ -22,6 +22,8 @@ pms:
cp -fr module zentaopms/
cp -fr www zentaopms && rm -fr zentaopms/www/data/ && mkdir -p zentaopms/www/data/upload
cp -fr tmp zentaopms
mv zentaopms/www/install.php.tmp zentaopms/www/install.php
mv zentaopms/www/upgrade.php.tmp zentaopms/www/upgrade.php
rm -fr zentaopms/tmp/cache/*
rm -fr zentaopms/tmp/extension/*
rm -fr zentaopms/tmp/log/*
module/upgrade/lang/zh-cn.php
+3 -3
View File
@@ -27,12 +27,12 @@ $lang->upgrade->warnningContent = <<<EOT
比如： mysqldump -u root -p zentao >zentao.bak
</pre>
EOT;
$lang->upgrade->createFileWinCMD = '打开命令行，执行<strong>echo > %s</strong>';
$lang->upgrade->createFileLinuxCMD = '在命令行执行: <strong>touch %s;</strong>';
$lang->upgrade->createFileWinCMD = '打开命令行，执行<strong style="color:#ed980f">echo > %s</strong>';
$lang->upgrade->createFileLinuxCMD = '在命令行执行: <strong style="color:#ed980f">touch %s;</strong>';
$lang->upgrade->setStatusFile = '<h4>升级之前请先完成下面的操作：</h4>
<ul style="line-height:1.5;font-size:13px;">
<li>%s</li>
<li>或者删掉"%s" 这个文件 ，重新创建一个ok.txt文件，不需要内容。</li>
<li>或者删掉"<strong style="color:#ed980f">%s</strong>" 这个文件 ，重新创建一个<strong style="color:#ed980f">ok.txt</strong>文件，不需要内容。</li>
</ul>
<p><strong style="color:red">我已经仔细阅读上面提示且完成上述工作，<a href="upgrade.php">继续更新</a></strong></p>';
$lang->upgrade->selectVersion = '选择版本';
www/index.php
+4 -4
View File
@@ -46,15 +46,15 @@ if(!(!is_numeric($config->version{0}) and $config->version{0} != $config->instal
if(file_exists('install.php') or file_exists('upgrade.php'))
{
$undeleteFiles = array();
if(file_exists('install.php') and !unlink('install.php')) $undeleteFiles[] = '<strong>install.php</strong>';
if(file_exists('upgrade.php') and !unlink('upgrade.php')) $undeleteFiles[] = '<strong>upgrade.php</strong>';
if(file_exists('install.php') and !unlink('install.php')) $undeleteFiles[] = '<strong style="color:#ed980f">install.php</strong>';
if(file_exists('upgrade.php') and !unlink('upgrade.php')) $undeleteFiles[] = '<strong style="color:#ed980f">upgrade.php</strong>';
$wwwDir = __DIR__;
if($undeleteFiles)
{
echo "<html><head><meta charset='utf-8'></head>
<body><table align='center' style='width:700px; margin-top:100px; border:1px solid gray; font-size:14px;'><tr><td style='padding:8px'>";
echo "<div style='margin-bottom:8px;'>安全起见，请删除 <strong>{$wwwDir}</strong> 目录下的 " . join(' 和 ', $undeleteFiles) . " 文件。</div>";
echo "<div>Please remove " . join(' and ', $undeleteFiles) . " under <strong>$wwwDir</strong> dir for security reason.</div>";
echo "<div style='margin-bottom:8px;'>安全起见，请删除 <strong style='color:#ed980f'>{$wwwDir}</strong> 目录下的 " . join(' 和 ', $undeleteFiles) . " 文件。</div>";
echo "<div>Please remove " . join(' and ', $undeleteFiles) . " under <strong style='color:#ed980f'>$wwwDir</strong> dir for security reason.</div>";
die("</td></tr></table></body></html>");
}
}