From 42cbfc46bed2a81223c47db7f5d60ed3a5fce63f Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 17 Jun 2024 18:31:48 +0800 Subject: [PATCH] * [misc.0.3h] adjust params type for repo and mr page. --- module/mr/ui/diff.html.php | 2 +- module/repo/control.php | 24 ++++++++++++------------ module/repo/ui/diffeditor.html.php | 2 +- module/repo/zen.php | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php index 505b72c3e6..7bf77959b5 100644 --- a/module/mr/ui/diff.html.php +++ b/module/mr/ui/diff.html.php @@ -40,7 +40,7 @@ detailHeader $entry = count($diffs) ? $diffs[0]->fileName : ''; $currentEntry = $this->repo->encodePath($entry); $fileInfo = $entry ? pathinfo($entry) : array(); -$showBug = isset($showBug) ? $showBug : true; +$showBug = isset($showBug) ? $showBug : 0; $objectID = isset($objectID) ? $objectID : 0; $tree = $this->repo->getFileTree($repo, '', $diffs); $diffLink = $this->repo->createLink('diff', "repoID={$MR->repoID}&objectID=$objectID&entry=&oldrevision={oldRevision}&newRevision={newRevision}"); diff --git a/module/repo/control.php b/module/repo/control.php index e30eb4c942..5faf2a52b7 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -353,12 +353,12 @@ class repo extends control * @param int $objectID * @param string $entry * @param string $revision - * @param string $showBug + * @param int $showBug * @param string $encoding * @access public * @return void */ - public function monaco(int $repoID, int $objectID = 0, string $entry = '', string $revision = 'HEAD', string $showBug = 'false', string $encoding = '') + public function monaco(int $repoID, int $objectID = 0, string $entry = '', string $revision = 'HEAD', int $showBug = 0, string $encoding = '') { $this->commonAction($repoID, $objectID); @@ -409,12 +409,12 @@ class repo extends control * @param int $objectID * @param string $entry * @param string $revision - * @param string $showBug + * @param int $showBug * @param string $encoding * @access public * @return void */ - public function view(int $repoID, int $objectID = 0, string $entry = '', string $revision = 'HEAD', string $showBug = 'false', string $encoding = '') + public function view(int $repoID, int $objectID = 0, string $entry = '', string $revision = 'HEAD', int $showBug = 0, string $encoding = '') { set_time_limit(0); if($this->get->repoPath) $entry = $this->get->repoPath; @@ -687,13 +687,13 @@ class repo extends control * @param string $entry * @param string $oldRevision * @param string $newRevision - * @param string $showBug + * @param int $showBug * @param string $encoding * @param bool $isBranchOrTag * @access public * @return void */ - public function diff(int $repoID, int $objectID = 0, string $entry = '', string $oldRevision = '', string $newRevision = '', string $showBug = 'false', string $encoding = '', bool $isBranchOrTag = false) + public function diff(int $repoID, int $objectID = 0, string $entry = '', string $oldRevision = '', string $newRevision = '', int $showBug = 0, string $encoding = '', int $isBranchOrTag = 0) { $newRevision = strtr($newRevision, '*', '-'); $oldRevision = strtr($oldRevision, '*', '-'); @@ -761,11 +761,11 @@ class repo extends control * @param string $fromRevision * @param string $toRevision * @param string $type - * @param bool $isBranchOrTag + * @param int $isBranchOrTag * @access public * @return void */ - public function download(int $repoID, string $path, string $fromRevision = 'HEAD', string $toRevision = '', string $type = 'file', bool $isBranchOrTag = false) + public function download(int $repoID, string $path, string $fromRevision = 'HEAD', string $toRevision = '', string $type = 'file', int $isBranchOrTag = 0) { if($this->get->repoPath) $path = $this->get->repoPath; $entry = $this->repo->decodePath($path); @@ -1066,12 +1066,12 @@ class repo extends control * @param string $entry * @param string $oldRevision * @param string $newRevision - * @param string $showBug // Used for biz. + * @param int $showBug // Used for biz. * @param string $encoding * @access public * @return void */ - public function ajaxGetDiffEditorContent(int $repoID, int $objectID = 0, string $entry = '', string $oldRevision = '', string $newRevision = '', string $showBug = 'false', string $encoding = '') + public function ajaxGetDiffEditorContent(int $repoID, int $objectID = 0, string $entry = '', string $oldRevision = '', string $newRevision = '', int $showBug = 0, string $encoding = '') { if(!$entry) $entry = (string) $this->cookie->repoCodePath; @@ -1116,12 +1116,12 @@ class repo extends control * @param int $objectID * @param string $entry * @param string $revision - * @param string $showBug + * @param int $showBug * @param string $encoding * @access public * @return void */ - public function ajaxGetEditorContent(int $repoID, int $objectID = 0, string $entry = '', string $revision = 'HEAD', string $showBug = 'false', string $encoding = '') + public function ajaxGetEditorContent(int $repoID, int $objectID = 0, string $entry = '', string $revision = 'HEAD', int $showBug = 0, string $encoding = '') { if(!$entry) $entry = (string) $this->cookie->repoCodePath; diff --git a/module/repo/ui/diffeditor.html.php b/module/repo/ui/diffeditor.html.php index 8b1fd3c6a0..1f4c1a969e 100644 --- a/module/repo/ui/diffeditor.html.php +++ b/module/repo/ui/diffeditor.html.php @@ -16,7 +16,7 @@ $inModal = isInModal() || !empty($fromModal); $entry = count($diffs) ? $diffs[0]->fileName : ''; $currentEntry = $this->repo->encodePath($entry); $fileInfo = $entry ? pathinfo($entry) : array(); -$showBug = isset($showBug) ? $showBug : true; +$showBug = isset($showBug) ? $showBug : 0; $objectID = isset($objectID) ? $objectID : 0; $tree = $this->repo->getFileTree($repo, '', $diffs); $diffLink = $this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $file . "&oldrevision={oldRevision}&newRevision={newRevision}"); diff --git a/module/repo/zen.php b/module/repo/zen.php index 1dff420187..f7be29ccae 100644 --- a/module/repo/zen.php +++ b/module/repo/zen.php @@ -1331,12 +1331,12 @@ class repoZen extends repo * @param int $repoID * @param int $objectID * @param string $arrange - * @param bool $isBranchOrTag + * @param int $isBranchOrTag * @param string $file * @access protected * @return void */ - protected function locateDiffPage(int $repoID, int $objectID, string $arrange, bool $isBranchOrTag, string $file) + protected function locateDiffPage(int $repoID, int $objectID, string $arrange, int $isBranchOrTag, string $file) { $oldRevision = isset($this->post->revision[1]) ? $this->post->revision[1] : ''; $newRevision = isset($this->post->revision[0]) ? $this->post->revision[0] : ''; @@ -1347,9 +1347,9 @@ class repoZen extends repo helper::setcookie('arrange', $arrange); } if($this->post->encoding) $encoding = $this->post->encoding; - if($this->post->isBranchOrTag) $isBranchOrTag = $this->post->isBranchOrTag; + if($this->post->isBranchOrTag) $isBranchOrTag = (int)$this->post->isBranchOrTag; - return $this->locate($this->repo->createLink('diff', "repoID={$repoID}&objectID={$objectID}&entry={$file}&oldrevision={$oldRevision}&newRevision={$newRevision}&showBug=&encoding={$encoding}&isBranchOrTag={$isBranchOrTag}")); + return $this->locate($this->repo->createLink('diff', "repoID={$repoID}&objectID={$objectID}&entry={$file}&oldrevision={$oldRevision}&newRevision={$newRevision}&showBug=0&encoding={$encoding}&isBranchOrTag={$isBranchOrTag}")); } /**