Merge branch 'devops_cyy_bug' into 'devops24'

Fix bug #12206, 12342.

See merge request easycorp/zentaopms!2337

module/backup/control.php

@@ -336,7 +336,8 @@ class backup extends control
         if($statusFile)
         {
             $this->app->loadLang('extension');
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace(dirname($this->app->getBasePath()) . DS, '', $statusFile));
+            $statusFile = str_replace(dirname($this->app->getBasePath()) . DS, '', $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
             return print($this->display());
         }
 

module/extension/control.php

@@ -29,7 +29,8 @@ class extension extends control
             $this->view->title      = $this->lang->extension->browse;
             $this->view->position[] = $this->lang->extension->browse;
 
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile));
+            $statusFile = str_replace('\\', '/', $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
             $this->display('extension', 'safe');
             helper::end();
         }
@@ -148,7 +149,7 @@ class extension extends control
         $statusFile = $this->loadModel('common')->checkSafeFile();
         if($statusFile)
         {
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
             return $this->display();
         }
         /* Get the package file name. */
@@ -421,7 +422,7 @@ class extension extends control
         $statusFile = $this->loadModel('common')->checkSafeFile();
         if($statusFile)
         {
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
             return $this->display();
         }
 

module/extension/lang/en.php

@@ -92,13 +92,14 @@ $lang->extension->viewInstalled            = 'Installed Extensions';
 $lang->extension->viewAvailable            = 'Available Extensions';
 $lang->extension->viewDeactivated          = 'Deactivated Extensions';
 $lang->extension->backDBFile               = 'This extension data has been backed up to %s!';
-$lang->extension->noticeOkFile             = '<h5>For security reasons, your Admin account has to be confirmed.</h5>
+$lang->extension->noticeOkFile             = "<h5>For security reasons, your Admin account has to be confirmed.</h5>
     <h5>Plese login your ZenTao server and create %s.</h5>
+    <p>Execute command: echo '' > %s</p>
     <p>Note</p>
     <ol>
     <li>The file you will create is empty.</li>
     <li>If such file exists, delete it first, and then create one.</li>
-    </ol>'; 
+    </ol>"; 
 
 $lang->extension->upgradeExt     = 'Upgrade';
 $lang->extension->installExt     = 'Install';

module/extension/lang/zh-cn.php

@@ -92,13 +92,14 @@ $lang->extension->viewInstalled            = '查看已安装插件';
 $lang->extension->viewAvailable            = '查看可安装插件';
 $lang->extension->viewDeactivated          = '查看已禁用插件';
 $lang->extension->backDBFile               = '插件相关数据已经备份到 %s 文件中！';
-$lang->extension->noticeOkFile             = '<h5>为了安全起见，系统需要确认您的管理员身份</h5>
+$lang->extension->noticeOkFile             = "<h5>为了安全起见，系统需要确认您的管理员身份</h5>
     <h5>请登录禅道所在的服务器，创建%s文件。</h5>
+    <p>可以执行命令：echo '' > %s</p>
     <p>注意：</p>
     <ol>
     <li>文件内容为空。</li>
     <li>如果之前文件存在，删除之后重新创建。</li>
-    </ol>';
+    </ol>";
 
 $lang->extension->upgradeExt     = '升级';
 $lang->extension->installExt     = '安装';

module/upgrade/css/afterexec.css

@@ -69,3 +69,5 @@
 .card.ad > .card-reveal > .card-heading {padding: 12px 10px 10px 15px;}
 .card.ad > .card-reveal {color: #333;}
 .card.ad > .card-reveal li {line-height: 1.5; font-size: 12px;}
+
+.result-box {height: 400px; position: fixed; left: 50%; top: 50%; margin-left: -400px; margin-top: -200px;}

module/upgrade/view/afterexec.html.php

@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div class='container'>
-  <div class='modal-dialog'>
+  <div class='modal-dialog result-box'>
     <div class='modal-header'>
       <strong><?php echo $lang->upgrade->result;?></strong>
     </div>

xuanxuan/extension/xuan/client/ext/control/create.php

@@ -8,8 +8,9 @@ class myClient extends client
         if($statusFile)
         {
             $this->app->loadLang('extension');
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile));
-            die($this->display('client', 'safe'));
+            $statusFile = str_replace('\\', '/', $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
+            return print($this->display('client', 'safe'));
         }
 
         if($_POST) $_POST['desc'] = mb_substr($this->post->desc, 0, 100);

xuanxuan/extension/xuan/client/ext/control/edit.php

@@ -8,8 +8,9 @@ class myClient extends client
         if($statusFile)
         {
             $this->app->loadLang('extension');
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile));
-            die($this->display('client', 'safe'));
+            $statusFile = str_replace('\\', '/', $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
+            return print($this->display('client', 'safe'));
         }
 
         if($_POST) $_POST['desc'] = mb_substr($this->post->desc, 0, 100);