Refactor random::TYPE_* Constants

This commit is contained in:
Romain Neutron
2012-03-09 15:12:23 +01:00
parent 8761e04eda
commit d79c13f8c2
9 changed files with 17 additions and 15 deletions

View File

@@ -466,7 +466,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
}
if ($token === false)
{
$token = random::getUrlToken('rss', $this->id);
$token = random::getUrlToken(\random::TYPE_RSS, $this->id);
}
return new system_url($registry->get('GV_ServerName') . 'atom/' . $token);

View File

@@ -1215,7 +1215,7 @@ class basket_adapter implements cache_cacheableInterface
$expires = new DateTime('+10 days');
$url = $this->appbox->get_registry()->get('GV_ServerName')
. 'lightbox/index.php?LOG=' . random::getUrlToken(
'validate'
\random::TYPE_VALIDATE
, $row['usr_id']
, $expires
, $this->get_ssel_id()

View File

@@ -1541,7 +1541,8 @@ function pushIt($usr, $newBask, $parmLST, $users, $mail_content, $lng, $accuse)
$from = trim($me->get_email()) != "" ? $me->get_email() : false;
$url = $registry->get('GV_ServerName') . 'lightbox/index.php?LOG=' . random::getUrlToken('view', $user->get_id(), null, $new_basket->get_ssel_id());
$url = $registry->get('GV_ServerName') . 'lightbox/index.php?LOG='
. random::getUrlToken(\random::TYPE_VIEW, $user->get_id(), null, $new_basket->get_ssel_id());
if ($me->get_id() == $user->get_id())
$my_link = $url;
@@ -1621,7 +1622,8 @@ function pushValidation($usr, $ssel_id, $listUsrs, $time, $mail_content, $accuse
$message = $mail_content . "<br/>\n<br/>\n";
$url = $registry->get('GV_ServerName') . 'lightbox/index.php?LOG=' . random::getUrlToken('validate', $user->get_id(), $expires, $ssel_id);
$url = $registry->get('GV_ServerName') . 'lightbox/index.php?LOG='
. random::getUrlToken(\random::TYPE_VALIDATE, $user->get_id(), $expires, $ssel_id);
$name = $user->get_display_name();

View File

@@ -127,7 +127,7 @@ class mail
{
$registry = registry::get_instance();
$date = new DateTime('1 day');
$token = random::getUrlToken('email', $usr_id, $date, $email);
$token = random::getUrlToken(\random::TYPE_EMAIL, $usr_id, $date, $email);
$url = $registry->get('GV_ServerName') . 'login/reset-email.php?token=' . $token;
@@ -174,7 +174,7 @@ class mail
{
$registry = registry::get_instance();
$expire = new DateTime('+3 days');
$token = random::getUrlToken('password', $usr_id, $expire, $email);
$token = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, $expire, $email);
$subject = _('login::register: sujet email : confirmation de votre adresse email');