namespace Friendica\Model;
+use DivineOmega\DOFileCachePSR6\CacheItemPool;
use DivineOmega\PasswordExposed;
+use ErrorException;
use Exception;
use Friendica\Content\Pager;
use Friendica\Core\Hook;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\TwoFactor\AppSpecificPassword;
-use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException;
use Friendica\Object\Image;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Worker\Delivery;
+use ImagickException;
use LightOpenID;
/**
/**
* Returns the default group for a given user and network
*
- * @param int $uid User id
+ * @param int $uid User id
* @param string $network network name
*
* @return int group id
- * @throws InternalServerErrorException
+ * @throws Exception
*/
public static function getDefaultGroup($uid, $network = '')
{
* @param string $password
* @param bool $third_party
* @return int User Id if authentication is successful
- * @throws Exception
+ * @throws HTTPException\ForbiddenException
+ * @throws HTTPException\NotFoundException
*/
public static function getIdFromPasswordAuthentication($user_info, $password, $third_party = false)
{
return $user['uid'];
}
- throw new Exception(DI::l10n()->t('Login failed'));
+ throw new HTTPException\ForbiddenException(DI::l10n()->t('Login failed'));
}
/**
*
* @param mixed $user_info
* @return array
- * @throws Exception
+ * @throws HTTPException\NotFoundException
*/
private static function getAuthenticationInfo($user_info)
{
}
if (!DBA::isResult($user)) {
- throw new Exception(DI::l10n()->t('User not found'));
+ throw new HTTPException\NotFoundException(DI::l10n()->t('User not found'));
}
}
* Generates a human-readable random password
*
* @return string
+ * @throws Exception
*/
public static function generateNewPassword()
{
*/
public static function isPasswordExposed($password)
{
- $cache = new \DivineOmega\DOFileCachePSR6\CacheItemPool();
+ $cache = new CacheItemPool();
$cache->changeConfig([
'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
]);
$passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
- } catch (\Exception $e) {
+ } catch (Exception $e) {
Logger::error('Password Exposed Exception: ' . $e->getMessage(), [
'code' => $e->getCode(),
'file' => $e->getFile(),
*
* @param string $nickname The nickname that should be checked
* @return boolean True is the nickname is blocked on the node
- * @throws InternalServerErrorException
*/
public static function isNicknameBlocked($nickname)
{
*
* @param array $data
* @return array
- * @throws \ErrorException
- * @throws InternalServerErrorException
- * @throws \ImagickException
+ * @throws ErrorException
+ * @throws HTTPException\InternalServerErrorException
+ * @throws ImagickException
* @throws Exception
*/
public static function create(array $data)
$nickname = $data['nickname'] = strtolower($nickname);
- if (!preg_match('/^[a-z0-9][a-z0-9\_]*$/', $nickname)) {
+ if (!preg_match('/^[a-z0-9][a-z0-9_]*$/', $nickname)) {
throw new Exception(DI::l10n()->t('Your nickname can only contain a-z, 0-9 and _.'));
}
*
* @return bool True, if the allow was successful
*
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws Exception
*/
public static function allow(string $hash)
* @param string $lang The user's language (default is english)
*
* @return bool True, if the user was created successfully
- * @throws InternalServerErrorException
- * @throws \ErrorException
- * @throws \ImagickException
+ * @throws HTTPException\InternalServerErrorException
+ * @throws ErrorException
+ * @throws ImagickException
*/
public static function createMinimal(string $name, string $email, string $nick, string $lang = L10n::DEFAULT)
{
if (empty($name) ||
empty($email) ||
empty($nick)) {
- throw new InternalServerErrorException('Invalid arguments.');
+ throw new HTTPException\InternalServerErrorException('Invalid arguments.');
}
$result = self::create([
* @param string $siteurl
* @param string $password Plaintext password
* @return NULL|boolean from notification() and email() inherited
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)
{
*
* It's here as a function because the mail is sent from different parts
*
- * @param \Friendica\Core\L10n $l10n The used language
- * @param array $user User record array
- * @param string $sitename
- * @param string $siteurl
- * @param string $password Plaintext password
+ * @param L10n $l10n The used language
+ * @param array $user User record array
+ * @param string $sitename
+ * @param string $siteurl
+ * @param string $password Plaintext password
*
* @return NULL|boolean from notification() and email() inherited
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
- public static function sendRegisterOpenEmail(\Friendica\Core\L10n $l10n, $user, $sitename, $siteurl, $password)
+ public static function sendRegisterOpenEmail(L10n $l10n, $user, $sitename, $siteurl, $password)
{
$preamble = Strings::deindent($l10n->t(
'
/**
* @param int $uid user to remove
* @return bool
- * @throws InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function remove(int $uid)
{
// unique), so it cannot be re-registered in the future.
DBA::insert('userd', ['username' => $user['nickname']]);
- // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
+ // The user and related data will be deleted in Friendica\Worker\CronJobs::expireAndRemoveUsers()
DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid);
'total_users' => 0,
'active_users_halfyear' => 0,
'active_users_monthly' => 0,
+ 'active_users_weekly' => 0,
];
$userStmt = DBA::select('owner-view', ['uid', 'login_date', 'last-item'],
$halfyear = time() - (180 * 24 * 60 * 60);
$month = time() - (30 * 24 * 60 * 60);
+ $week = time() - (7 * 24 * 60 * 60);
while ($user = DBA::fetch($userStmt)) {
$statistics['total_users']++;
) {
$statistics['active_users_monthly']++;
}
+
+ if ((strtotime($user['login_date']) > $week) || (strtotime($user['last-item']) > $week)
+ ) {
+ $statistics['active_users_weekly']++;
+ }
}
DBA::close($userStmt);
$condition = [];
switch ($type) {
case 'active':
+ $condition['account_removed'] = false;
$condition['blocked'] = false;
break;
case 'blocked':
projects / friendica.git / blobdiff