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

* Fix sql and rename program to PRJ.

Browse Source
This commit is contained in:
Yagami
2020-09-16 11:28:55 +08:00
parent 143ada5106
commit 66f4f5403a
76 changed files with 351 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+2 -2
View File
@@ -930,10 +930,10 @@ class baseControl
* @access public
* @return string the link string.
*/
public function createLink($moduleName, $methodName = 'index', $vars = array(), $viewType = '', $onlybody = false, $programID = 0)
public function createLink($moduleName, $methodName = 'index', $vars = array(), $viewType = '', $onlybody = false, $PRJID = 0)
{
if(empty($moduleName)) $moduleName = $this->moduleName;
return helper::createLink($moduleName, $methodName, $vars, $viewType, $onlybody, $programID);
return helper::createLink($moduleName, $methodName, $vars, $viewType, $onlybody, $PRJID);
}
/**
framework/base/helper.class.php
+14 -14
View File
@@ -60,11 +60,11 @@ class baseHelper
* @access public
* @return string the link string.
*/
static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false, $programID = 0)
static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false, $PRJID = 0)
{
/* 设置$appName和$moduleName。Set appName and moduleName. */
global $app, $config;
$programID = $programID ? $programID : $app->session->program;
$PRJID = $PRJID ? $PRJID : $app->session->PRJ;
if(strpos($moduleName, '.') !== false)
{
@@ -97,7 +97,7 @@ class baseHelper
foreach($vars as $key => $value) $link .= "&$key=$value";
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProgramParam($link, $programID, $onlyBody);
return self::processPRJParam($link, $PRJID, $onlyBody);
}
/**
@@ -113,7 +113,7 @@ class baseHelper
$link .= '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProgramParam($link, $programID, $onlyBody);
return self::processPRJParam($link, $PRJID, $onlyBody);
}
/**
@@ -125,7 +125,7 @@ class baseHelper
{
$link .= $config->default->method . '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProgramParam($link, $programID, $onlyBody);
return self::processPRJParam($link, $PRJID, $onlyBody);
}
/**
@@ -137,7 +137,7 @@ class baseHelper
{
$link .= $moduleName . '/';
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProgramParam($link, $programID, $onlyBody);
return self::processPRJParam($link, $PRJID, $onlyBody);
}
/**
@@ -147,28 +147,28 @@ class baseHelper
*/
$link .= $moduleName . '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProgramParam($link, $programID, $onlyBody);
return self::processPRJParam($link, $PRJID, $onlyBody);
}
/**
* 处理program 参数。
* Process the programID param in url.
* 处理PRJ 参数。
* Process the PRJID param in url.
*
* 如果传参的时候设定了$programID，在生成链接的时候继续追加。
* 如果传参的时候设定了$PRJID，在生成链接的时候继续追加。
* If $progrmID in the url, append it to the link.
*
* @param string $link
* @param int $programID
* @param int $PRJID
* @param bool $onlybody
* @static
* @access public
* @return string
*/
public static function processProgramParam($link, $programID = '', $onlybody = false)
public static function processPRJParam($link, $PRJID = '', $onlybody = false)
{
global $config;
if(!$programID) return $link;
$link .= strpos($link, '?') === false ? "?pgm=$programID" : "&pgm=$programID";
if(!$PRJID) return $link;
$link .= strpos($link, '?') === false ? "?PRJ=$PRJID" : "&PRJ=$PRJID";
return $link;
}
framework/base/router.class.php
+3 -3
View File
@@ -372,7 +372,7 @@ class baseRouter
$this->setErrorHandler();
$this->setTimezone();
$this->startSession();
$this->setProgram();
$this->setPRJ();
if($this->config->framework->multiSite) $this->setSiteCode() && $this->loadExtraConfig();
if($this->config->framework->autoConnectDB) $this->connectDB();
@@ -847,9 +847,9 @@ class baseRouter
* @access public
* @return void
*/
public function setProgram()
public function setPRJ()
{
if(isset($_GET['pgm'])) $this->session->set('program', $_GET['pgm']); //Set program id into session.
if(isset($_GET['PRJ'])) $this->session->set('PRJ', $_GET['PRJ']); //Set PRJ id into session.
}
/**
framework/router.class.php
+1 -1
View File
@@ -150,7 +150,7 @@ class router extends baseRouter
$productIndex = $storyIndex = $hourIndex = $planIndex = $URAndSR = 0;
$projectIndex = empty($this->config->isINT) ? 0 : 1;
if($this->session->program) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->program}")->fetch();
if($this->session->PRJ) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->PRJ}")->fetch();
foreach($commonSettings as $setting)
{