Banks not linking to admin accounts correctly #2

KieranFYI · Feb 8, 2020 · a669da9 · a669da9
1 parent e23fb22
commit a669da9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/Entity/Ban.php b/Entity/Ban.php
@@ -1,15 +1,17 @@
 <?php
 
 namespace Kieran\Bans\Entity;
-
+
+use XF;
+use XF\Draft;
 use XF\Mvc\Entity\Entity;
 use XF\Mvc\Entity\Structure;
 
 class Ban extends Entity
 {
 
 	public function canView() {
-		$visitor = \XF::visitor();
+		$visitor = XF::visitor();
 
 		if (!$visitor->user_id)
 		{
@@ -42,10 +44,17 @@ public function associateUser() {
         }
 
         $type = $this->getIdentityTypeRepo()->findIdentityType('steam');
-
         if ($type == null) {
             return;
-        }
+		}
+
+		if ($this->server_ip === $this->admin_ip) {
+			if (XF::options()->console_user > 0) {
+				$this->admin_user_id = XF::options()->console_user;
+				$this->save();
+			}
+			return;
+		}
 
 		$identity = $this->getIdentityRepo()->findIdentityByValueByType($this->admin_id, $type->identity_type_id);
 		if ($identity !== null && $identity->user_id > 0) {
@@ -55,7 +64,7 @@ public function associateUser() {
 	}
 
 	public function newNote() {
-		$visitor = \XF::visitor();
+		$visitor = XF::visitor();
 		if (!$visitor->user_id) {
 			return null;
 		}
@@ -80,7 +89,7 @@ public function getSteamid32() {
 
 	public function getDraftReply()
 	{
-		return \XF\Draft::createFromEntity($this, 'DraftReplies');
+		return Draft::createFromEntity($this, 'DraftReplies');
 	}
 
 	public function getRemaining() {
@@ -184,7 +193,7 @@ public static function getStructure(Structure $structure)
 			'ban_status' => ['type' => self::UINT, 'maxLength' => 1, 'default' => 0],
 			'type_id' => ['type' => self::STR, 'required' => true, 'nullable' => false, 'maxLength' => 25],
 			'ban_review' => ['type' => self::UINT, 'maxLength' => 1, 'default' => 0],
-			'timestamp' => ['type' => self::UINT, 'default' => \XF::$time],
+			'timestamp' => ['type' => self::UINT, 'default' => XF::$time],
         ];
 
         $structure->getters = [

diff --git a/_data/option_groups.xml b/_data/option_groups.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<option_groups/>
+<option_groups>
+  <group group_id="bans" icon="fa-gavel" display_order="1" debug_only="0"/>
+</option_groups>
diff --git a/_data/options.xml b/_data/options.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<options/>
+<options>
+  <option option_id="console_user" edit_format="username" data_type="integer">
+    <default_value>0</default_value>
+    <relation group_id="bans" display_order="1"/>
+  </option>
+</options>
diff --git a/_data/phrases.xml b/_data/phrases.xml
@@ -36,6 +36,10 @@
   <phrase title="nav.bansCreated" version_id="1000000" version_string="1.0.0 Alpha"><![CDATA[Created Bans]]></phrase>
   <phrase title="nav.bansManage" version_id="1000000" version_string="1.0.0 Alpha"><![CDATA[All Bans]]></phrase>
   <phrase title="nav.bansMyBans" version_id="1000000" version_string="1.0.0 Alpha"><![CDATA[My Bans]]></phrase>
+  <phrase title="option.console_user" version_id="1000070" version_string="1.0.0"><![CDATA[Console User]]></phrase>
+  <phrase title="option_explain.console_user" version_id="1000070" version_string="1.0.0"><![CDATA[The user to set for console bans]]></phrase>
+  <phrase title="option_group.bans" version_id="1000070" version_string="1.0.0"><![CDATA[Bans]]></phrase>
+  <phrase title="option_group_description.bans" version_id="1000070" version_string="1.0.0"><![CDATA[]]></phrase>
   <phrase title="permission.bans_bans_create" version_id="1000000" version_string="1.0.0 Alpha"><![CDATA[Create bans]]></phrase>
   <phrase title="permission.bans_bans_manage" version_id="1000000" version_string="1.0.0 Alpha"><![CDATA[Manage bans]]></phrase>
   <phrase title="permission.bans_bans_view" version_id="1000000" version_string="1.0.0 Alpha"><![CDATA[View bans]]></phrase>