Skip to content

Commit

Permalink
Merge pull request kestasjk#45 from diptobi1/fowFix
Browse files Browse the repository at this point in the history 
Fixing FoW variants giving to much info to an participating admin
  • Loading branch information
@Sleepcap
Sleepcap committed Aug 21, 2019
2 parents f70b06c + 3cfa270 commit c7aa720
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
10 changes: 5 additions & 5 deletions variants/Classic1898Fog/classes/panelMember.php
View file
Expand Up @@ -57,24 +57,24 @@ function memberBetWon()
function lastLoggedInTxt()
{
global $User;
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::lastLoggedInTxt();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::lastLoggedInTxt();
return '??';
}

function memberFinalized()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/Classic1898Fog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/Classic1898Fog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}

8 changes: 4 additions & 4 deletions variants/Classic1898Fog/classes/panelMemberHome.php
View file
Expand Up @@ -29,15 +29,15 @@ function memberFinalized()
{
global $User;
if ($this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/Classic1898Fog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/Classic1898Fog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}
10 changes: 5 additions & 5 deletions variants/ClassicFog/classes/panelMember.php
View file
Expand Up @@ -57,24 +57,24 @@ function memberBetWon()
function lastLoggedInTxt()
{
global $User;
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::lastLoggedInTxt();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::lastLoggedInTxt();
return '??';
}

function memberFinalized()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/ClassicFog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/ClassicFog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}

8 changes: 4 additions & 4 deletions variants/ClassicFog/classes/panelMemberHome.php
View file
Expand Up @@ -29,15 +29,15 @@ function memberFinalized()
{
global $User;
if ($this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/ClassicFog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/ClassicFog/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}
6 changes: 3 additions & 3 deletions variants/PunicWars/classes/panelMember.php
View file
Expand Up @@ -57,23 +57,23 @@ function memberBetWon()
function lastLoggedInTxt()
{
global $User;
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::lastLoggedInTxt();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::lastLoggedInTxt();
return '??';
}

function memberFinalized()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}
Expand Down
4 changes: 2 additions & 2 deletions variants/PunicWars/classes/panelMemberHome.php
View file
Expand Up @@ -29,15 +29,15 @@ function memberFinalized()
{
global $User;
if ($this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

Expand Down
10 changes: 5 additions & 5 deletions variants/RatWars/classes/panelMember.php
View file
Expand Up @@ -57,24 +57,24 @@ function memberBetWon()
function lastLoggedInTxt()
{
global $User;
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::lastLoggedInTxt();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::lastLoggedInTxt();
return '??';
}

function memberFinalized()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/RatWars/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/RatWars/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}

8 changes: 4 additions & 4 deletions variants/RatWars/classes/panelMemberHome.php
View file
Expand Up @@ -29,15 +29,15 @@ function memberFinalized()
{
global $User;
if ($this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/RatWars/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/RatWars/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}
10 changes: 5 additions & 5 deletions variants/TenSixtySix/classes/panelMember.php
View file
Expand Up @@ -57,7 +57,7 @@ function memberBetWon()
function lastLoggedInTxt()
{
global $User;
if ( ($this->userID == $User->id) || ( ($User->type['Moderator']) && (! $this->Game->Members->isJoined()) ) ) return parent::lastLoggedInTxt();
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::lastLoggedInTxt();
return '??';
}

Expand All @@ -73,16 +73,16 @@ function memberFinalized()
{
global $User;
if( $this->status!='Playing' ) return '';
if ( ($this->userID == $User->id) || ( ($User->type['Moderator']) && (! $this->Game->Members->isJoined()) ) ) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/TenSixtySix/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/TenSixtySix/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}

Expand Down
8 changes: 4 additions & 4 deletions variants/TenSixtySix/classes/panelMemberHome.php
View file
Expand Up @@ -27,16 +27,16 @@ function memberFinalized()
{
global $User;
if ($this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/TenSixtySix/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalized();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}

function memberFinalizedAnon()
{
global $User;
if( $this->status!='Playing' ) return '';
if (($this->userID == $User->id) || ($User->type['Admin'])) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/TenSixtySix/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
if (($this->userID == $User->id) || ( $User->type['Admin'] && !$this->Members->isJoined() )) return parent::memberFinalizedAnon();
return '<span class="member'.$this->id.'StatusIcon"><img src="variants/'.$this->Game->Variant->name.'/resources/question.png" alt="?" title="Unknown orderstatus" /></span>';
}
}

Expand Down

0 comments on commit c7aa720

Please sign in to comment.