Skip to content

Commit

Permalink
Move to more static.
Browse files Browse the repository at this point in the history 
Calling the task states should be a static caller.
  • Loading branch information
@mastacontrola
mastacontrola committed Jan 1, 2017
1 parent 4148e87 commit df67eff
Show file tree
Hide file tree
Showing 29 changed files with 155 additions and 155 deletions.
68 changes: 34 additions & 34 deletions packages/web/lib/client/snapinclient.class.php
View file
Expand Up @@ -47,16 +47,16 @@ public function json()
array(
'jobID' => $SnapinJob->get('id'),
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
)
)
);
if ($STaskCount < 1) {
if ($Task->isValid()) {
$Task->set('stateID', $this->getCompleteState())->save();
$Task->set('stateID', self::getCompleteState())->save();
}
$SnapinJob->set('stateID', $this->getCompleteState())->save();
$SnapinJob->set('stateID', self::getCompleteState())->save();
self::$EventManager->notify(
'HOST_SNAPIN_COMPLETE',
array(
Expand All @@ -68,11 +68,11 @@ public function json()
}
if ($Task->isValid()) {
$Task
->set('stateID', $this->getCheckedInState())
->set('stateID', self::getCheckedInState())
->set('checkInTime', $date)
->save();
}
$SnapinJob->set('stateID', $this->getCheckedInState())->save();
$SnapinJob->set('stateID', self::getCheckedInState())->save();
global $sub;
if ($sub === 'requestClientInfo'
|| basename(self::$scriptname) === 'snapins.checkin.php'
Expand All @@ -82,8 +82,8 @@ public function json()
'SnapinTask',
array(
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
),
'jobID' => $SnapinJob->get('id'),
),
Expand All @@ -95,7 +95,7 @@ public function json()
);
if (count($snapinIDs) < 1) {
$SnapinJob
->set('stateID', $this->getCancelledState())
->set('stateID', self::getCancelledState())
->save();
return array(
'error' => _('No valid tasks found')
Expand All @@ -117,8 +117,8 @@ public function json()
'snapinID' => $Snapin->get('id'),
'jobID' => $SnapinJob->get('id'),
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
)
)
);
Expand Down Expand Up @@ -173,7 +173,7 @@ public function json()
$hash = $Snapin->get('hash');
$SnapinTask
->set('checkin', $date)
->set('stateID', $this->getCheckedInState())
->set('stateID', self::getCheckedInState())
->save();
$action = '';
if ($Snapin->get('shutdown')) {
Expand Down Expand Up @@ -229,16 +229,16 @@ public function send()
array(
'jobID' => $SnapinJob->get('id'),
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
)
)
);
if ($STaskCount < 1) {
if ($Task->isValid()) {
$Task->set('stateID', $this->getCompleteState())->save();
$Task->set('stateID', self::getCompleteState())->save();
}
$SnapinJob->set('stateID', $this->getCompleteState())->save();
$SnapinJob->set('stateID', self::getCompleteState())->save();
self::$EventManager->notify(
'HOST_SNAPIN_COMPLETE',
array(
Expand All @@ -250,19 +250,19 @@ public function send()
}
if ($Task->isValid()) {
$Task
->set('stateID', $this->getCheckedInState())
->set('stateID', self::getCheckedInState())
->set('checkInTime', $date)
->save();
}
$SnapinJob->set('stateID', $this->getCheckedInState())->save();
$SnapinJob->set('stateID', self::getCheckedInState())->save();
if (basename(self::$scriptname) === 'snapins.checkin.php') {
if (!isset($_REQUEST['exitcode'])) {
$snapinIDs = self::getSubObjectIDs(
'SnapinTask',
array(
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
),
'jobID' => $SnapinJob->get('id'),
),
Expand All @@ -274,7 +274,7 @@ public function send()
);
if (count($snapinIDs) < 1) {
$SnapinJob
->set('stateID', $this->getCancelledState())
->set('stateID', self::getCancelledState())
->save();
throw new Exception(
sprintf(
Expand All @@ -291,7 +291,7 @@ public function send()
$Snapin = array_shift($Snapins);
if (!($Snapin instanceof Snapin && $Snapin->isValid())) {
$SnapinJob
->set('stateID', $this->getCancelledState())
->set('stateID', self::getCancelledState())
->save();
throw new Exception(
sprintf(
Expand All @@ -307,8 +307,8 @@ public function send()
'snapinID' => $Snapin->get('id'),
'jobID' => $SnapinJob->get('id'),
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
)
)
);
Expand Down Expand Up @@ -411,8 +411,8 @@ private function _closeout($Task, $SnapinJob, $date, $HostName)
&& !in_array(
$SnapinTask->get('stateID'),
array(
$this->getCompleteState(),
$this->getCancelledState()
self::getCompleteState(),
self::getCancelledState()
)
))
) {
Expand All @@ -435,7 +435,7 @@ private function _closeout($Task, $SnapinJob, $date, $HostName)
);
}
$SnapinTask
->set('stateID', $this->getCompleteState())
->set('stateID', self::getCompleteState())
->set('return', $_REQUEST['exitcode'])
->set('details', $_REQUEST['exitdesc'])
->set('complete', $date)
Expand All @@ -454,16 +454,16 @@ private function _closeout($Task, $SnapinJob, $date, $HostName)
array(
'jobID' => $SnapinJob->get('id'),
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
)
)
);
if ($STaskCount < 1) {
if ($Task->isValid()) {
$Task->set('stateID', $this->getCompleteState())->save();
$Task->set('stateID', self::getCompleteState())->save();
}
$SnapinJob->set('stateID', $this->getCompleteState())->save();
$SnapinJob->set('stateID', self::getCompleteState())->save();
self::$EventManager->notify(
'HOST_SNAPIN_COMPLETE',
array(
Expand Down Expand Up @@ -592,15 +592,15 @@ private function _downloadfile($Task, $SnapinJob, $date, $HostName)
);
if ($Task->isValid()) {
$Task
->set('stateID', $this->getProgressState())
->set('stateID', self::getProgressState())
->set('checkInTime', $date)
->save();
}
$SnapinJob
->set('stateID', $this->getProgressState())
->set('stateID', self::getProgressState())
->save();
$SnapinTask
->set('stateID', $this->getProgressState())
->set('stateID', self::getProgressState())
->set('return', -1)
->set('details', _('Pending...'))
->save();
Expand Down
4 changes: 2 additions & 2 deletions packages/web/lib/fog/bootmenu.class.php
View file
Expand Up @@ -697,8 +697,8 @@ public function sesscheck()
$findWhere = array(
'name' => trim($_REQUEST['sessname']),
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array)$this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
),
);
$Sessions = self::getClass('MulticastSessionsManager')
Expand Down
26 changes: 13 additions & 13 deletions packages/web/lib/fog/fogbase.class.php
View file
Expand Up @@ -1923,54 +1923,54 @@ public function setSetting($key, $value)
*
* @return array
*/
public function getQueuedStates()
public static function getQueuedStates()
{
return (array) self::getClass('TaskState')->getQueuedStates();
return (array)TaskState::getQueuedStates();
}
/**
* Get queued state main id.
*
* @return int
*/
public function getQueuedState()
public static function getQueuedState()
{
return self::getClass('TaskState')->getQueuedState();
return TaskState::getQueuedState();
}
/**
* Get checked in state id.
*
* @return int
*/
public function getCheckedInState()
public static function getCheckedInState()
{
return self::getClass('TaskState')->getCheckedInState();
return TaskState::getCheckedInState();
}
/**
* Get in progress state id.
*
* @return int
*/
public function getProgressState()
public static function getProgressState()
{
return self::getClass('TaskState')->getProgressState();
return TaskState::getProgressState();
}
/**
* Get complete state id.
*
* @return int
*/
public function getCompleteState()
public static function getCompleteState()
{
return self::getClass('TaskState')->getCompleteState();
return TaskState::getCompleteState();
}
/**
* Get cancelled state id.
*
* @return int
*/
public function getCancelledState()
public static function getCancelledState()
{
return self::getClass('TaskState')->getCancelledState();
return TaskState::getCancelledState();
}
/**
* Put string between two strings.
Expand All @@ -1981,7 +1981,7 @@ public function getCancelledState()
*
* @return string
*/
public function stringBetween($string, $start, $end)
public static function stringBetween($string, $start, $end)
{
$string = " $string";
$ini = strpos($string, $start);
Expand Down
20 changes: 10 additions & 10 deletions packages/web/lib/fog/group.class.php
View file
Expand Up @@ -389,8 +389,8 @@ public function addImage($imageID)
throw new Exception(_('Select a valid image'));
}
$states = self::fastmerge(
$this->getQueuedStates(),
(array) $this->getProgressState()
self::getQueuedStates(),
(array)self::getProgressState()
);
$TaskCount = self::getClass('TaskManager')
->count(
Expand Down Expand Up @@ -451,8 +451,8 @@ public function createImagePackage(
array(
'hostID' => $hostids,
'stateID' => self::fastmerge(
$this->getQueuedStates(),
(array) $this->getProgressState()
self::getQueuedStates(),
(array) self::getProgressState()
),
)
);
Expand Down Expand Up @@ -559,7 +559,7 @@ public function createImagePackage(
$username,
$hostIDs[$i],
0,
$this->getQueuedState(),
self::getQueuedState(),
$TaskType->get('id'),
$wol,
$Image->get('id'),
Expand Down Expand Up @@ -641,7 +641,7 @@ public function createImagePackage(
$username,
$hostIDs[$i],
0,
$this->getQueuedState(),
self::getQueuedState(),
$TaskType->get('id'),
$wol,
$imageIDs[$i],
Expand Down Expand Up @@ -685,7 +685,7 @@ public function createImagePackage(
$taskName,
$username,
$hostIDs[$i],
$this->getQueuedState(),
self::getQueuedState(),
$TaskType->get('id'),
$wol,
);
Expand All @@ -711,7 +711,7 @@ public function createImagePackage(
$taskName,
$username,
$hostIDs[$i],
$this->getQueuedState(),
self::getQueuedState(),
$TaskType->get('id'),
$wol,
);
Expand Down Expand Up @@ -797,7 +797,7 @@ private function _createSnapinTasking($now, $snapin = -1)
}
$snapinJobs[] = array(
$hostID,
$this->getQueuedState(),
self::getQueuedState(),
$now->format('Y-m-d H:i:s'),
);
}
Expand All @@ -822,7 +822,7 @@ private function _createSnapinTasking($now, $snapin = -1)
for ($j = 0; $j < $snapinCount; ++$j) {
$snapinTasks[] = array(
$jobID,
$this->getQueuedState(),
self::getQueuedState(),
$snapins[$hostID][$j],
);
}
Expand Down

0 comments on commit df67eff

Please sign in to comment.