hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor random::TYPE_* Constants

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/User/Adapter.class.php
View File

@@ -466,7 +466,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
} }
if ($token === false) 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); return new system_url($registry->get('GV_ServerName') . 'atom/' . $token);

2
lib/classes/basket/adapter.class.php
View File

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

6
lib/classes/deprecated/push.api.php
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; $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()) if ($me->get_id() == $user->get_id())
$my_link = $url; $my_link = $url;
@@ -1621,7 +1622,8 @@ function pushValidation($usr, $ssel_id, $listUsrs, $time, $mail_content, $accuse
$message = $mail_content . "<br/>\n<br/>\n"; $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(); $name = $user->get_display_name();

4
lib/classes/mail.class.php
View File

@@ -127,7 +127,7 @@ class mail
{ {
$registry = registry::get_instance(); $registry = registry::get_instance();
$date = new DateTime('1 day'); $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; $url = $registry->get('GV_ServerName') . 'login/reset-email.php?token=' . $token;
@@ -174,7 +174,7 @@ class mail
{ {
$registry = registry::get_instance(); $registry = registry::get_instance();
$expire = new DateTime('+3 days'); $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'); $subject = _('login::register: sujet email : confirmation de votre adresse email');

10
lib/unitTest/randomTest.php
View File

@@ -13,7 +13,7 @@ class randomTest extends PhraseanetPHPUnitAbstract
{ {
$expires_on = new DateTime('-5 minutes'); $expires_on = new DateTime('-5 minutes');
$usr_id = self::$user->get_id(); $usr_id = self::$user->get_id();
$token = random::getUrlToken('password', $usr_id, $expires_on, 'some nice datas'); $token = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, $expires_on, 'some nice datas');
random::cleanTokens(); random::cleanTokens();
try try
@@ -76,7 +76,7 @@ class randomTest extends PhraseanetPHPUnitAbstract
public function testGetUrlToken() public function testGetUrlToken()
{ {
$usr_id = self::$user->get_id(); $usr_id = self::$user->get_id();
$token = random::getUrlToken('password', $usr_id, null, 'some nice datas'); $token = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, null, 'some nice datas');
$datas = random::helloToken($token); $datas = random::helloToken($token);
$this->assertEquals('some nice datas', $datas['datas']); $this->assertEquals('some nice datas', $datas['datas']);
random::updateToken($token, 'some very nice datas'); random::updateToken($token, 'some very nice datas');
@@ -101,7 +101,7 @@ class randomTest extends PhraseanetPHPUnitAbstract
public function testHelloToken() public function testHelloToken()
{ {
$usr_id = self::$user->get_id(); $usr_id = self::$user->get_id();
$token = random::getUrlToken('password', $usr_id, null, 'some nice datas'); $token = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, null, 'some nice datas');
$datas = random::helloToken($token); $datas = random::helloToken($token);
$this->assertEquals('some nice datas', $datas['datas']); $this->assertEquals('some nice datas', $datas['datas']);
$this->assertNull($datas['expire_on']); $this->assertNull($datas['expire_on']);
@@ -125,7 +125,7 @@ class randomTest extends PhraseanetPHPUnitAbstract
$expires_on = new DateTime('+5 minutes'); $expires_on = new DateTime('+5 minutes');
$usr_id = self::$user->get_id(); $usr_id = self::$user->get_id();
$token = random::getUrlToken('password', $usr_id, $expires_on, 'some nice datas'); $token = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, $expires_on, 'some nice datas');
$datas = random::helloToken($token); $datas = random::helloToken($token);
$this->assertEquals('some nice datas', $datas['datas']); $this->assertEquals('some nice datas', $datas['datas']);
$sql_expires = new DateTime($datas['expire_on']); $sql_expires = new DateTime($datas['expire_on']);
@@ -151,7 +151,7 @@ class randomTest extends PhraseanetPHPUnitAbstract
$expires_on = new DateTime('-5 minutes'); $expires_on = new DateTime('-5 minutes');
$usr_id = self::$user->get_id(); $usr_id = self::$user->get_id();
$token = random::getUrlToken('password', $usr_id, $expires_on, 'some nice datas'); $token = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, $expires_on, 'some nice datas');
try try
{ {

2
www/include/download.php
View File

@@ -48,7 +48,7 @@ $list['export_name'] = $exportname . '.zip';
$endDate = new DateTime('+3 hours'); $endDate = new DateTime('+3 hours');
$url = random::getUrlToken('download', $session->get_usr_id(), $endDate, serialize($list)); $url = random::getUrlToken(\random::TYPE_DOWNLOAD, $session->get_usr_id(), $endDate, serialize($list));
if ($url) if ($url)
{ {

2
www/include/sendmailpage.php
View File

@@ -58,7 +58,7 @@ $list['email'] = $parm["destmail"];
$endate_obj = new DateTime('+1 day'); $endate_obj = new DateTime('+1 day');
$endDate = $endate_obj; $endDate = $endate_obj;
$token = random::getUrlToken('email', false, $endDate, serialize($list)); $token = random::getUrlToken(\random::TYPE_EMAIL, false, $endDate, serialize($list));
$emails = explode(',', $parm["destmail"]); $emails = explode(',', $parm["destmail"]);

2
www/login/authenticate.php
View File

@@ -106,7 +106,7 @@ if ((!is_null($parm['login']) && !is_null($parm['pwd'])) || $is_guest)
{ {
$date = new DateTime('5 minutes'); $date = new DateTime('5 minutes');
$usr_id = User_Adapter::get_usr_id_from_login($parm['login']); $usr_id = User_Adapter::get_usr_id_from_login($parm['login']);
$url = random::getUrlToken('password', $usr_id, $date); $url = random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, $date);
$url = '/login/forgotpwd.php?token=' . $url . '&salt=1'; $url = '/login/forgotpwd.php?token=' . $url . '&salt=1';

2
www/login/forgotpwd.php
View File

@@ -44,7 +44,7 @@ if (isset($parm["mail"]) && trim($parm["mail"]) != "")
} }
$date = new DateTime('1 day'); $date = new DateTime('1 day');
$url = random::getUrlToken('password', $user->get_id(), $date); $url = random::getUrlToken(\random::TYPE_PASSWORD, $user->get_id(), $date);
if ($url !== false) if ($url !== false)
{ {