NoProfileException now parent to User* and Group*
This commit is contained in:
parent
db7ef52d13
commit
cd0e3f1fa4
74
lib/groupnoprofileexception.php
Normal file
74
lib/groupnoprofileexception.php
Normal file
|
@ -0,0 +1,74 @@
|
|||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Class for an exception when the group profile is missing
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @category Exception
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @copyright 2010 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* Class for an exception when the group profile is missing
|
||||
*
|
||||
* @category Exception
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
class GroupNoProfileException extends NoProfileException
|
||||
{
|
||||
public $group = null;
|
||||
|
||||
/**
|
||||
* constructor
|
||||
*
|
||||
* @param User_group $user User_group that's missing a profile
|
||||
*/
|
||||
|
||||
public function __construct(User_group $group)
|
||||
{
|
||||
$this->group = $group;
|
||||
|
||||
// TRANS: Exception text shown when no profile can be found for a user.
|
||||
// TRANS: %1$s is a user nickname, $2$d is a user ID (number).
|
||||
$message = sprintf(_('User %1$s (%2$d) has no profile record.'),
|
||||
$group->nickname, $group->id);
|
||||
|
||||
parent::__construct($group->profile_id, $message);
|
||||
}
|
||||
|
||||
/**
|
||||
* Accessor for user
|
||||
*
|
||||
* @return User_group the group that triggered this exception
|
||||
*/
|
||||
|
||||
public function getGroup()
|
||||
{
|
||||
return $this->group;
|
||||
}
|
||||
}
|
59
lib/noprofileexception.php
Normal file
59
lib/noprofileexception.php
Normal file
|
@ -0,0 +1,59 @@
|
|||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Parent class for an exception when a profile is missing
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @category Exception
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @copyright 2010 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* Parent class for an exception when a profile is missing
|
||||
*
|
||||
* @category Exception
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
class NoProfileException extends NoProfileException
|
||||
{
|
||||
public $profile_id = null;
|
||||
|
||||
public function __construct($profile_id, $msg=null)
|
||||
{
|
||||
$this->id = (int)$profile_id;
|
||||
|
||||
if ($msg === null) {
|
||||
// TRANS: Exception text shown when no profile can be found for a user.
|
||||
// TRANS: %1$s is a user nickname, $2$d is a user ID (number).
|
||||
$msg = sprintf(_('User %1$s (%2$d) has no profile record.'),
|
||||
$group->nickname, $group->id);
|
||||
}
|
||||
|
||||
parent::__construct($msg, 404);
|
||||
}
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* class for an exception when the user profile is missing
|
||||
* Class for an exception when the user profile is missing
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
|
@ -27,9 +27,7 @@
|
|||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET')) {
|
||||
exit(1);
|
||||
}
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* Class for an exception when the user profile is missing
|
||||
|
@ -41,9 +39,9 @@ if (!defined('STATUSNET')) {
|
|||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
class UserNoProfileException extends ServerException
|
||||
class UserNoProfileException extends NoProfileException
|
||||
{
|
||||
var $user = null;
|
||||
protected $user = null;
|
||||
|
||||
/**
|
||||
* constructor
|
||||
|
@ -51,7 +49,7 @@ class UserNoProfileException extends ServerException
|
|||
* @param User $user User that's missing a profile
|
||||
*/
|
||||
|
||||
public function __construct($user)
|
||||
public function __construct(User $user)
|
||||
{
|
||||
$this->user = $user;
|
||||
|
||||
|
@ -60,7 +58,7 @@ class UserNoProfileException extends ServerException
|
|||
$message = sprintf(_('User %1$s (%2$d) has no profile record.'),
|
||||
$user->nickname, $user->id);
|
||||
|
||||
parent::__construct($message);
|
||||
parent::__construct($user->id, $message);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user