diff --git a/src/applications/metamta/contentsource/PhabricatorContentSource.php b/src/applications/metamta/contentsource/PhabricatorContentSource.php index 6d6a8ee896..e2320eb85f 100644 --- a/src/applications/metamta/contentsource/PhabricatorContentSource.php +++ b/src/applications/metamta/contentsource/PhabricatorContentSource.php @@ -1,106 +1,104 @@ } public static function newForSource($source, array $params) { $obj = new PhabricatorContentSource(); $obj->source = $source; $obj->params = $params; return $obj; } public static function newFromSerialized($serialized) { $dict = json_decode($serialized, true); if (!is_array($dict)) { $dict = array(); } $obj = new PhabricatorContentSource(); $obj->source = idx($dict, 'source', self::SOURCE_UNKNOWN); $obj->params = idx($dict, 'params', array()); return $obj; } public static function newConsoleSource() { return self::newForSource( self::SOURCE_CONSOLE, array()); } public static function newFromRequest(AphrontRequest $request) { return self::newForSource( self::SOURCE_WEB, - array( - 'ip' => $request->getRemoteAddr(), - )); + array()); } public static function newFromConduitRequest(ConduitAPIRequest $request) { return self::newForSource( self::SOURCE_CONDUIT, array()); } public static function getSourceNameMap() { return array( self::SOURCE_WEB => pht('Web'), self::SOURCE_EMAIL => pht('Email'), self::SOURCE_CONDUIT => pht('Conduit'), self::SOURCE_MOBILE => pht('Mobile'), self::SOURCE_TABLET => pht('Tablet'), self::SOURCE_FAX => pht('Fax'), self::SOURCE_CONSOLE => pht('Console'), self::SOURCE_LEGACY => pht('Legacy'), self::SOURCE_HERALD => pht('Herald'), self::SOURCE_DAEMON => pht('Daemons'), self::SOURCE_LIPSUM => pht('Lipsum'), self::SOURCE_UNKNOWN => pht('Old World'), self::SOURCE_PHORTUNE => pht('Phortune'), self::SOURCE_BULK => pht('Bulk Edit'), ); } public function serialize() { return json_encode(array( 'source' => $this->getSource(), 'params' => $this->getParams(), )); } public function getSource() { return $this->source; } public function getParams() { return $this->params; } public function getParam($key, $default = null) { return idx($this->params, $key, $default); } }