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

- Remove PRJ param in url.

Browse Source
This commit is contained in:
zhujinyong
2021-03-17 14:13:22 +08:00
parent e7d17f6e24
commit 691e9392f0
7 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+6 -39
View File
@@ -56,17 +56,14 @@ class baseHelper
* @param string|array $vars the params passed to the method, can be array('key' => 'value') or key1=value1&key2=value2) or key1=value1&key2=value2
* @param string $viewType the view type
* @param bool $onlyBody pass onlyBody=yes to the link thus the app can control the header and footer hide or show..
* @param bool $PRJID set PRJ id in to session.
* @param bool $removePRJ if true, remove PRJ param.
* @static
* @access public
* @return string the link string.
*/
static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false, $PRJID = 0, $removePRJ = false)
static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false)
{
/* 设置$appName和$moduleName。Set appName and moduleName. */
global $app, $config;
$PRJID = $PRJID ? $PRJID : $app->session->PRJ;
if(strpos($moduleName, '.') !== false)
{
@@ -98,8 +95,7 @@ class baseHelper
if($viewType != 'html') $link .= "&{$config->viewVar}=" . $viewType;
foreach($vars as $key => $value) $link .= "&$key=$value";
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -115,7 +111,7 @@ class baseHelper
$link .= '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processProjectParam($link, $onlyBody, $moduleName);
}
/**
@@ -127,7 +123,7 @@ class baseHelper
{
$link .= $config->default->method . '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processProjectParam($link, $onlyBody, $moduleName);
}
/**
@@ -139,7 +135,7 @@ class baseHelper
{
$link .= $moduleName . '/';
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processProjectParam($link, $onlyBody, $moduleName);
}
/**
@@ -148,36 +144,7 @@ class baseHelper
*
*/
$link .= $moduleName . '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
}
/**
* 处理PRJ 参数。
* Process the PRJID param in url.
*
* 如果传参的时候设定了$PRJID，在生成链接的时候继续追加。
* If $progrmID in the url, append it to the link.
*
* @param string $link
* @param int $PRJID
* @param bool $onlybody
* @param string $moduleName
* @param bool $removePRJ
* @static
* @access public
* @return string
*/
public static function processProjectParam($link, $PRJID = '', $onlybody = false, $moduleName = '', $removePRJ = false)
{
global $config, $lang;
if(!$PRJID || $removePRJ) return $link;
$app = zget($lang->navGroup, $moduleName);
if($app != 'project' and $app != 'execution') return $link;
$link .= strpos($link, '?') === false ? "?PRJ=$PRJID" : "&PRJ=$PRJID";
return $link;
return self::processOnlyBodyParam($link, $onlyBody);
}
/**