From 6f25acbb873c556c43a5507d16256325654cccbd Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 22 Oct 2020 16:05:05 +0800
Subject: [PATCH] * Fix details.

---
 module/program/view/pgmedit.html.php | 2 +-
 module/program/view/prjedit.html.php | 2 +-
 module/user/model.php                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/program/view/pgmedit.html.php b/module/program/view/pgmedit.html.php
index c889236538..3c5ac7dc02 100644
--- a/module/program/view/pgmedit.html.php
+++ b/module/program/view/pgmedit.html.php
@@ -84,7 +84,7 @@
   </div>
 </div>
 <div id='PGMAcl' class='hidden'>
-  <?php echo nl2br(html::radio('acl', $lang->program->PGMAclList, $program->acl, '', 'block'));?>
+  <?php echo nl2br(html::radio('acl', $lang->program->PGMAclList, $program->acl == 'program' ? 'private' : 'open', '', 'block'));?>
 </div>
 <div id='subPGMAcl' class='hidden'>
   <?php echo nl2br(html::radio('acl', $lang->program->subPGMAclList, $program->acl, '', 'block'));?>
diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php
index bba43d12c2..bfd1b22b78 100644
--- a/module/program/view/prjedit.html.php
+++ b/module/program/view/prjedit.html.php
@@ -132,7 +132,7 @@
   </div>
 </div>
 <div id='PRJAcl' class='hidden'>
-  <?php echo nl2br(html::radio('acl', $lang->program->PRJAclList, $project->acl, '', 'block'));?>
+  <?php echo nl2br(html::radio('acl', $lang->program->PRJAclList, $project->acl == 'program' ? 'private' : 'open', '', 'block'));?>
 </div>
 <div id='PGMAcl' class='hidden'>
   <?php echo nl2br(html::radio('acl', $lang->program->PGMPRJAclList, $project->acl, '', 'block'));?>
diff --git a/module/user/model.php b/module/user/model.php
index 2f89f8797a..4b9e07a947 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1938,7 +1938,7 @@ class userModel extends model
         /* Parent program managers. */
         if($project->type == 'project' && $project->parent != 0 && $project->acl == 'program')
         {
-            $path     = trim($project->path, ",$project->id,");
+            $path     = str_replace(",{$project->id},", ',', "{$project->path}");
             $programs = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll();
             foreach($programs as $program)
             {
@@ -2023,7 +2023,7 @@ class userModel extends model
         /* Parent program managers. */
         if($project->type == 'project' && $project->parent != 0 && $project->acl == 'program')
         {
-            $path     = trim($project->path, ",$project->id,");
+            $path     = str_replace(",{$project->id},", ',', "{$project->path}");
             $programs = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll();
             foreach($programs as $program)
             {