From d79c13f8c2532bff12f48c40db28b8aa6038fddd Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 9 Mar 2012 15:12:23 +0100 Subject: [PATCH] Refactor random::TYPE_* Constants --- lib/classes/User/Adapter.class.php | 2 +- lib/classes/basket/adapter.class.php | 2 +- lib/classes/deprecated/push.api.php | 6 ++++-- lib/classes/mail.class.php | 4 ++-- lib/unitTest/randomTest.php | 10 +++++----- www/include/download.php | 2 +- www/include/sendmailpage.php | 2 +- www/login/authenticate.php | 2 +- www/login/forgotpwd.php | 2 +- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/classes/User/Adapter.class.php b/lib/classes/User/Adapter.class.php index 69522981dc..3268c3621f 100644 --- a/lib/classes/User/Adapter.class.php +++ b/lib/classes/User/Adapter.class.php @@ -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); diff --git a/lib/classes/basket/adapter.class.php b/lib/classes/basket/adapter.class.php index ea6a9043be..0321f10440 100644 --- a/lib/classes/basket/adapter.class.php +++ b/lib/classes/basket/adapter.class.php @@ -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() diff --git a/lib/classes/deprecated/push.api.php b/lib/classes/deprecated/push.api.php index c0ff1689b8..c0ba56a77f 100644 --- a/lib/classes/deprecated/push.api.php +++ b/lib/classes/deprecated/push.api.php @@ -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 . "
\n
\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(); diff --git a/lib/classes/mail.class.php b/lib/classes/mail.class.php index 28c88e0e26..d03b9fc6ed 100644 --- a/lib/classes/mail.class.php +++ b/lib/classes/mail.class.php @@ -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'); diff --git a/lib/unitTest/randomTest.php b/lib/unitTest/randomTest.php index 4ff9663c54..3d1e76bd93 100644 --- a/lib/unitTest/randomTest.php +++ b/lib/unitTest/randomTest.php @@ -13,7 +13,7 @@ class randomTest extends PhraseanetPHPUnitAbstract { $expires_on = new DateTime('-5 minutes'); $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(); try @@ -76,7 +76,7 @@ class randomTest extends PhraseanetPHPUnitAbstract public function testGetUrlToken() { $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); $this->assertEquals('some nice datas', $datas['datas']); random::updateToken($token, 'some very nice datas'); @@ -101,7 +101,7 @@ class randomTest extends PhraseanetPHPUnitAbstract public function testHelloToken() { $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); $this->assertEquals('some nice datas', $datas['datas']); $this->assertNull($datas['expire_on']); @@ -125,7 +125,7 @@ class randomTest extends PhraseanetPHPUnitAbstract $expires_on = new DateTime('+5 minutes'); $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); $this->assertEquals('some nice datas', $datas['datas']); $sql_expires = new DateTime($datas['expire_on']); @@ -151,7 +151,7 @@ class randomTest extends PhraseanetPHPUnitAbstract $expires_on = new DateTime('-5 minutes'); $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 { diff --git a/www/include/download.php b/www/include/download.php index 405a7634d4..4b1ba1f646 100644 --- a/www/include/download.php +++ b/www/include/download.php @@ -48,7 +48,7 @@ $list['export_name'] = $exportname . '.zip'; $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) { diff --git a/www/include/sendmailpage.php b/www/include/sendmailpage.php index 5fd1c8840c..f82717807b 100644 --- a/www/include/sendmailpage.php +++ b/www/include/sendmailpage.php @@ -58,7 +58,7 @@ $list['email'] = $parm["destmail"]; $endate_obj = new DateTime('+1 day'); $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"]); diff --git a/www/login/authenticate.php b/www/login/authenticate.php index aecce0cf06..11813664c6 100644 --- a/www/login/authenticate.php +++ b/www/login/authenticate.php @@ -106,7 +106,7 @@ if ((!is_null($parm['login']) && !is_null($parm['pwd'])) || $is_guest) { $date = new DateTime('5 minutes'); $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'; diff --git a/www/login/forgotpwd.php b/www/login/forgotpwd.php index 215119acc7..9177bbd2c9 100644 --- a/www/login/forgotpwd.php +++ b/www/login/forgotpwd.php @@ -44,7 +44,7 @@ if (isset($parm["mail"]) && trim($parm["mail"]) != "") } $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) {