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

* change the 'private' to 'public'.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2012-02-09 07:53:36 +00:00
parent b30c103ecc
commit f2ef4a56f6
15 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/action/model.php
View File

@@ -453,10 +453,10 @@ class actionModel extends model
* Compute the begin date and end date of a period.
*
* @param string $period
* @access private
* @access public
* @return array
*/
private function computeBeginAndEnd($period)
public function computeBeginAndEnd($period)
{
$this->loadModel('todo');

4
module/bug/control.php
View File

@@ -718,10 +718,10 @@ class bug extends control
*
* @param int $bugID
* @param int $actionID
* @access private
* @access public
* @return void
*/
private function sendmail($bugID, $actionID)
public function sendmail($bugID, $actionID)
{
/* Set toList and ccList. */
$bug = $this->bug->getByID($bugID);

4
module/dept/model.php
View File

@@ -29,10 +29,10 @@ class deptModel extends model
* Build the query.
*
* @param int $rootDeptID
* @access private
* @access public
* @return string
*/
private function buildMenuQuery($rootDeptID)
public function buildMenuQuery($rootDeptID)
{
$rootDept = $this->getByID($rootDeptID);
if(!$rootDept) $rootDept->path = '';

8
module/group/model.php
View File

@@ -64,10 +64,10 @@ class groupModel extends model
*
* @param string $fromGroup
* @param string $toGroup
* @access private
* @access public
* @return void
*/
private function copyPriv($fromGroup, $toGroup)
public function copyPriv($fromGroup, $toGroup)
{
$privs = $this->dao->findByGroup($fromGroup)->from(TABLE_GROUPPRIV)->fetchAll();
foreach($privs as $priv)
@@ -82,10 +82,10 @@ class groupModel extends model
*
* @param string $fromGroup
* @param string $toGroup
* @access private
* @access public
* @return void
*/
private function copyUser($fromGroup, $toGroup)
public function copyUser($fromGroup, $toGroup)
{
$users = $this->dao->findByGroup($fromGroup)->from(TABLE_USERGROUP)->fetchAll();
foreach($users as $user)

8
module/project/control.php
View File

@@ -63,10 +63,10 @@ class project extends control
* Common actions.
*
* @param int $projectID
* @access private
* @access public
* @return object current object
*/
private function commonAction($projectID = 0)
public function commonAction($projectID = 0)
{
$this->loadModel('product');
@@ -860,10 +860,10 @@ class project extends control
*
* @param int $taskID
* @param int $actionID
* @access private
* @access public
* @return void
*/
private function sendmail($taskID, $actionID)
public function sendmail($taskID, $actionID)
{
/* Set toList and ccList. */
$task = $this->loadModel('task')->getById($taskID);

4
module/search/model.php
View File

@@ -254,10 +254,10 @@ class searchModel extends model
*
* @param array $results
* @param string $module
* @access private
* @access public
* @return array
*/
private function formatResults($results, $module)
public function formatResults($results, $module)
{
/* Get title field. */
$title = ($module == 'story') ? 'title' : 'name';

8
module/story/control.php
View File

@@ -203,10 +203,10 @@ class story extends control
* The common action when edit or change a story.
*
* @param int $storyID
* @access private
* @access public
* @return void
*/
private function commonAction($storyID)
public function commonAction($storyID)
{
/* Get datas. */
$story = $this->story->getById($storyID);
@@ -549,10 +549,10 @@ class story extends control
*
* @param int $storyID
* @param int $actionID
* @access private
* @access public
* @return void
*/
private function sendmail($storyID, $actionID)
public function sendmail($storyID, $actionID)
{
$story = $this->story->getById($storyID);
$productName = $this->product->getById($story->product)->name;

4
module/story/model.php
View File

@@ -945,10 +945,10 @@ class storyModel extends model
* Format stories
*
* @param array $stories
* @access private
* @access public
* @return void
*/
private function formatStories($stories)
public function formatStories($stories)
{
/* Get module names of stories. */
/*$modules = array();

4
module/task/control.php
View File

@@ -521,10 +521,10 @@ class task extends control
*
* @param int $taskID
* @param int $actionID
* @access private
* @access public
* @return void
*/
private function sendmail($taskID, $actionID)
public function sendmail($taskID, $actionID)
{
/* Set toList and ccList. */
$task = $this->task->getById($taskID);

6
module/task/model.php
View File

@@ -570,7 +570,7 @@ class taskModel extends model
* @access private
* @return void
*/
private function processTasks($tasks)
public function processTasks($tasks)
{
$today = helper::today();
foreach($tasks as $task)
@@ -602,7 +602,7 @@ class taskModel extends model
* @access private
* @return object
*/
private function processTask($task)
public function processTask($task)
{
$today = helper::today();
@@ -640,7 +640,7 @@ class taskModel extends model
* @access private
* @return void
*/
private function setStatus($task)
public function setStatus($task)
{
$task->statusCustom = strpos(self::CUSTOM_STATUS_ORDER, $task->status) + 1;
}

4
module/testcase/model.php
View File

@@ -254,10 +254,10 @@ class testcaseModel extends model
* Join steps to a string, thus can diff them.
*
* @param array $steps
* @access private
* @access public
* @return string
*/
private function joinStep($steps)
public function joinStep($steps)
{
$retrun = '';
foreach($steps as $step) $return .= $step->desc . ' EXPECT:' . $step->expect . "\n";

8
module/todo/model.php
View File

@@ -372,10 +372,10 @@ class todoModel extends model
*
* If today in week is 1, move it one day in future. Else is 7, move it back one day. To keep the time geted in this week.
*
* @access private
* @access public
* @return time
*/
private function getMiddleOfThisWeek()
public function getMiddleOfThisWeek()
{
$baseTime = time();
$weekDay = date('N');
@@ -387,10 +387,10 @@ class todoModel extends model
/**
* Get middle of last week
*
* @access private
* @access public
* @return time
*/
private function getMiddleOfLastWeek()
public function getMiddleOfLastWeek()
{
$baseTime = time();
$weekDay = date('N');

28
module/tree/model.php
View File

@@ -31,10 +31,10 @@ class treeModel extends model
* @param int $rootID
* @param string $type
* @param int $startModule
* @access private
* @access public
* @return void
*/
private function buildMenuQuery($rootID, $type, $startModule)
public function buildMenuQuery($rootID, $type, $startModule)
{
/* Set the start module. */
$startModulePath = '';
@@ -263,10 +263,10 @@ class treeModel extends model
* Create link of a story.
*
* @param object $module
* @access private
* @access public
* @return string
*/
private function createStoryLink($module)
public function createStoryLink($module)
{
$linkHtml = html::a(helper::createLink('product', 'browse', "root={$module->root}&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
return $linkHtml;
@@ -276,10 +276,10 @@ class treeModel extends model
* Create link of a doc.
*
* @param object $module
* @access private
* @access public
* @return string
*/
private function createDocLink($module)
public function createDocLink($module)
{
$linkHtml = html::a(helper::createLink('doc', 'browse', "libID={$module->root}&&module={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
return $linkHtml;
@@ -289,10 +289,10 @@ class treeModel extends model
* Create the manage link of a module.
*
* @param object $module
* @access private
* @access public
* @return string
*/
private function createManageLink($module)
public function createManageLink($module)
{
static $users;
if(empty($users)) $users = $this->loadModel('user')->getPairs('noletter');
@@ -309,10 +309,10 @@ class treeModel extends model
* Create link of a bug.
*
* @param object $module
* @access private
* @access public
* @return string
*/
private function createBugLink($module)
public function createBugLink($module)
{
$linkHtml = html::a(helper::createLink('bug', 'browse', "root={$module->root}&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
return $linkHtml;
@@ -322,10 +322,10 @@ class treeModel extends model
* Create link of a test case.
*
* @param object $module
* @access private
* @access public
* @return string
*/
private function createCaseLink($module)
public function createCaseLink($module)
{
$linkHtml = html::a(helper::createLink('testcase', 'browse', "root={$module->root}&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
return $linkHtml;
@@ -335,10 +335,10 @@ class treeModel extends model
* Create link of a test task.
*
* @param object $module
* @access private
* @access public
* @return string
*/
private function createTestTaskLink($module, $extra)
public function createTestTaskLink($module, $extra)
{
$linkHtml = html::a(helper::createLink('testtask', 'cases', "taskID=$extra&type=byModule&module={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
return $linkHtml;

94
module/upgrade/model.php
View File

@@ -501,10 +501,10 @@ class upgradeModel extends model
/**
* Upgrade from 0.3 to 0.4
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom0_3To0_4()
public function upgradeFrom0_3To0_4()
{
$this->execSQL($this->getUpgradeFile('0.3'));
if(!$this->isError()) $this->setting->updateVersion('0.4 beta');
@@ -513,10 +513,10 @@ class upgradeModel extends model
/**
* Upgrade from 0.4 to 0.5
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom0_4To0_5()
public function upgradeFrom0_4To0_5()
{
$this->execSQL($this->getUpgradeFile('0.4'));
if(!$this->isError()) $this->setting->updateVersion('0.5 beta');
@@ -525,10 +525,10 @@ class upgradeModel extends model
/**
* Upgrade from 0.5 to 0.6.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom0_5To0_6()
public function upgradeFrom0_5To0_6()
{
$this->execSQL($this->getUpgradeFile('0.5'));
if(!$this->isError()) $this->setting->updateVersion('0.6 beta');
@@ -537,10 +537,10 @@ class upgradeModel extends model
/**
* Upgrade from 0.6 to 1.0 beta.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom0_6To1_0_B()
public function upgradeFrom0_6To1_0_B()
{
$this->execSQL($this->getUpgradeFile('0.6'));
if(!$this->isError()) $this->setting->updateVersion('1.0beta');
@@ -549,10 +549,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.0 beta to 1.0 rc1.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_0betaTo1_0rc1()
public function upgradeFrom1_0betaTo1_0rc1()
{
$this->execSQL($this->getUpgradeFile('1.0.beta'));
$this->updateCompany();
@@ -562,10 +562,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.0 rc1 to 1.0 rc2.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_0rc1To1_0rc2()
public function upgradeFrom1_0rc1To1_0rc2()
{
$this->execSQL($this->getUpgradeFile('1.0.rc1'));
if(!$this->isError()) $this->setting->updateVersion('1.0rc2');
@@ -574,10 +574,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.0 rc2 to 1.0 stable.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_0rc2To1_0stable()
public function upgradeFrom1_0rc2To1_0stable()
{
$this->setting->updateVersion('1.0');
}
@@ -585,10 +585,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.0 stable to 1.0.1.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_0stableTo1_0_1()
public function upgradeFrom1_0stableTo1_0_1()
{
$this->setting->updateVersion('1.0.1');
}
@@ -596,10 +596,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.0.1 to 1.1.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_0_1To1_1()
public function upgradeFrom1_0_1To1_1()
{
$this->execSQL($this->getUpgradeFile('1.0.1'));
if(!$this->isError()) $this->setting->updateVersion('1.1');
@@ -608,10 +608,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.1 to 1.2.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_1To1_2()
public function upgradeFrom1_1To1_2()
{
$this->execSQL($this->getUpgradeFile('1.1'));
if(!$this->isError()) $this->setting->updateVersion('1.2');
@@ -620,10 +620,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.2 to 1.3.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_2To1_3()
public function upgradeFrom1_2To1_3()
{
$this->execSQL($this->getUpgradeFile('1.2'));
$this->updateUBB();
@@ -634,10 +634,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.3 to 1.4.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_3To1_4()
public function upgradeFrom1_3To1_4()
{
$this->execSQL($this->getUpgradeFile('1.3'));
$this->updateNL1_3();
@@ -648,10 +648,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.4 to 1.5.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_4To1_5()
public function upgradeFrom1_4To1_5()
{
$this->execSQL($this->getUpgradeFile('1.4'));
if(!$this->isError()) $this->setting->updateVersion('1.5');
@@ -660,10 +660,10 @@ class upgradeModel extends model
/**
* Upgrade from 1.5 to 2.0.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom1_5To2_0()
public function upgradeFrom1_5To2_0()
{
$this->execSQL($this->getUpgradeFile('1.5'));
if(!$this->isError()) $this->setting->updateVersion('2.0');
@@ -672,10 +672,10 @@ class upgradeModel extends model
/**
* Upgrade from 2.0 to 2.1.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom2_0To2_1()
public function upgradeFrom2_0To2_1()
{
$this->execSQL($this->getUpgradeFile('2.0'));
if(!$this->isError()) $this->setting->updateVersion('2.1');
@@ -684,10 +684,10 @@ class upgradeModel extends model
/**
* Upgrade from 2.1 to 2.2.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom2_1To2_2()
public function upgradeFrom2_1To2_2()
{
$this->execSQL($this->getUpgradeFile('2.1'));
if(!$this->isError()) $this->setting->updateVersion('2.2');
@@ -696,10 +696,10 @@ class upgradeModel extends model
/**
* Upgrade from 2.2 to 2.3.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom2_2To2_3()
public function upgradeFrom2_2To2_3()
{
$this->execSQL($this->getUpgradeFile('2.2'));
$this->updateCases();
@@ -710,10 +710,10 @@ class upgradeModel extends model
/**
* Upgrade from 2.3 to 2.4.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom2_3To2_4()
public function upgradeFrom2_3To2_4()
{
$this->execSQL($this->getUpgradeFile('2.3'));
if(!$this->isError()) $this->setting->updateVersion('2.4');
@@ -722,10 +722,10 @@ class upgradeModel extends model
/**
* Upgrade from 2.4 to 3.0.beta1.
*
* @access private
* @access public
* @return void
*/
private function upgradeFrom2_4To3_0_beta1()
public function upgradeFrom2_4To3_0_beta1()
{
$this->execSQL($this->getUpgradeFile('2.4'));
if(!$this->isError()) $this->setting->updateVersion('3.0.beta1');
@@ -736,10 +736,10 @@ class upgradeModel extends model
*
* This method is used to update since 1.0 beta. Any new tables added after 1.0 beta should skip.
*
* @access private
* @access public
* @return void
*/
private function updateCompany()
public function updateCompany()
{
/* Get user defined constants. */
$constants = get_defined_constants(true);
@@ -763,10 +763,10 @@ class upgradeModel extends model
/**
* Update ubb code in bug table and user Templates table to html.
*
* @access private
* @access public
* @return void
*/
private function updateUBB()
public function updateUBB()
{
$this->app->loadClass('ubb', true);
@@ -957,7 +957,7 @@ class upgradeModel extends model
* @access public
* @return void
*/
private function updateActivatedCountOfBug()
public function updateActivatedCountOfBug()
{
$bugActivatedActions = $this->dao->select('*')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->eq('bug')->fetchAll();
if(!empty($bugActivatedActions))
@@ -1009,10 +1009,10 @@ class upgradeModel extends model
* Get the upgrade sql file.
*
* @param string $version
* @access private
* @access public
* @return string
*/
private function getUpgradeFile($version)
public function getUpgradeFile($version)
{
return $this->app->getAppRoot() . 'db' . $this->app->getPathFix() . 'update' . $version . '.sql';
}
@@ -1021,10 +1021,10 @@ class upgradeModel extends model
* Execute a sql.
*
* @param string $sqlFile
* @access private
* @access public
* @return void
*/
private function execSQL($sqlFile)
public function execSQL($sqlFile)
{
$mysqlVersion = $this->loadModel('install')->getMysqlVersion();

4
module/user/control.php
View File

@@ -196,10 +196,10 @@ class user extends control
* Set the rerferer.
*
* @param string $referer
* @access private
* @access public
* @return void
*/
private function setReferer($referer = '')
public function setReferer($referer = '')
{
if(!empty($referer))
{