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

Add notifications to feed entries

Browse Source
This commit is contained in:
Romain Neutron
2012-03-09 15:59:04 +01:00
parent 82d9eeef7b c36f6e3f7c
commit f7cc2702e2
19 changed files with 360 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
/nbproject/*
/config/*
.DS_Store
!.gitignore
.DS_Store
/vendor/.composer/

13
README.md
View File

@@ -14,16 +14,7 @@ https://docs.phraseanet.com/3.6/
#Easy Installation
**Fetch Sources**
<pre>
git clone git://github.com/alchemy-fr/Phraseanet.git Phraseanet
cd Phraseanet
./vendors.php
</pre>
Get the latests sources here https://github.com/alchemy-fr/Phraseanet/downloads
**Setup your webserver**
@@ -58,4 +49,4 @@ Let's go !
Phraseanet is licensed under GPL-v3 license.
[1]: http://developer.phraseanet.com/
[1]: http://developer.phraseanet.com/

2
lib/Alchemy/Phrasea/Application/Lightbox.php
View File

@@ -570,7 +570,7 @@ return call_user_func(
$expires = new \DateTime('+10 days');
$url = $appbox->get_registry()->get('GV_ServerName')
. 'lightbox/index.php?LOG=' . \random::getUrlToken(
'validate'
\random::TYPE_VALIDATE
, $basket->getValidation()->getInitiator()->get_id()
, $expires
, $basket->getId()

4
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -258,7 +258,7 @@ class Push implements ControllerProviderInterface
$url = $registry->get('GV_ServerName')
. 'lightbox/index.php?LOG='
. \random::getUrlToken('view', $user_receiver->get_id(), null, $Basket->getId());
. \random::getUrlToken(\random::TYPE_VIEW, $user_receiver->get_id(), null, $Basket->getId());
$params = array(
'from' => $user->get_id()
@@ -489,7 +489,7 @@ class Push implements ControllerProviderInterface
$url = $registry->get('GV_ServerName')
. 'lightbox/index.php?LOG='
. \random::getUrlToken('view', $participant_user->get_id(), null, $Basket->getId());
. \random::getUrlToken(\random::TYPE_VIEW, $participant_user->get_id(), null, $Basket->getId());
$params = array(
'from' => $user->get_id()

94
lib/classes/Feed/Entry/Adapter.class.php
View File

@@ -141,7 +141,7 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute(array(':id' => $this->id));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor();
if (!$row)
@@ -156,13 +156,13 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
$this->created_on = new DateTime($row['created_on']);
$datas = array(
'title' => $this->title
, 'subtitle' => $this->subtitle
, 'author_name' => $this->author_name
, 'author_email' => $this->author_email
, 'publisher_id' => $this->publisher_id
, 'updated_on' => $this->updated_on
, 'created_on' => $this->created_on
'title' => $this->title
, 'subtitle' => $this->subtitle
, 'author_name' => $this->author_name
, 'author_email' => $this->author_email
, 'publisher_id' => $this->publisher_id
, 'updated_on' => $this->updated_on
, 'created_on' => $this->created_on
);
$this->set_data_to_cache($datas);
@@ -175,9 +175,9 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
$registry = registry::get_instance();
$href = sprintf(
'%slightbox/feeds/entry/%d/'
, $registry->get('GV_ServerName')
, $this->get_id()
'%slightbox/feeds/entry/%d/'
, $registry->get('GV_ServerName')
, $this->get_id()
);
return new Feed_Link($href, $this->get_title(), 'text/html');
@@ -231,10 +231,10 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
if ($title === '')
throw new Exception_InvalidArgument();
$sql = 'UPDATE feed_entries
$sql = 'UPDATE feed_entries
SET title = :title, updated_on = NOW() WHERE id = :entry_id';
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute(array(':title' => $title, ':entry_id' => $this->get_id()));
$stmt->execute(array(':title' => $title, ':entry_id' => $this->get_id()));
$stmt->closeCursor();
$this->title = $title;
$this->delete_data_from_cache();
@@ -251,11 +251,11 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
{
$subtitle = strip_tags($subtitle);
$sql = 'UPDATE feed_entries
$sql = 'UPDATE feed_entries
SET description = :subtitle, updated_on = NOW()
WHERE id = :entry_id';
$params = array(':subtitle' => $subtitle, ':entry_id' => $this->get_id());
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute($params);
$stmt->closeCursor();
$this->subtitle = $subtitle;
@@ -271,14 +271,14 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
*/
public function set_author_name($author_name)
{
$sql = 'UPDATE feed_entries
$sql = 'UPDATE feed_entries
SET author_name = :author_name, updated_on = NOW()
WHERE id = :entry_id';
$params = array(
':author_name' => $author_name,
':entry_id' => $this->get_id()
':author_name' => $author_name,
':entry_id' => $this->get_id()
);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute($params);
$stmt->closeCursor();
$this->author_name = $author_name;
@@ -294,14 +294,14 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
*/
public function set_author_email($author_email)
{
$sql = 'UPDATE feed_entries
$sql = 'UPDATE feed_entries
SET author_email = :author_email, updated_on = NOW()
WHERE id = :entry_id';
$params = array(
':author_email' => $author_email,
':entry_id' => $this->get_id()
':author_email' => $author_email,
':entry_id' => $this->get_id()
);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute($params);
$stmt->closeCursor();
$this->author_email = $author_email;
@@ -312,14 +312,14 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
public function set_created_on(DateTime $datetime)
{
$sql = 'UPDATE feed_entries
$sql = 'UPDATE feed_entries
SET created_on = :created_on
WHERE id = :entry_id';
$params = array(
':created_on' => $datetime->format(DATE_ISO8601),
':entry_id' => $this->get_id()
':created_on' => $datetime->format(DATE_ISO8601),
':entry_id' => $this->get_id()
);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute($params);
$stmt->closeCursor();
$this->created_on = $datetime;
@@ -330,14 +330,14 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
public function set_updated_on(DateTime $datetime)
{
$sql = 'UPDATE feed_entries
$sql = 'UPDATE feed_entries
SET updated_on = :updated_on
WHERE id = :entry_id';
$params = array(
':updated_on' => $datetime->format(DATE_ISO8601),
':entry_id' => $this->get_id()
':updated_on' => $datetime->format(DATE_ISO8601),
':entry_id' => $this->get_id()
);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute($params);
$stmt->closeCursor();
$this->updated_on = $datetime;
@@ -411,10 +411,9 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
public function get_content()
{
if ($this->items)
return $this->items;
$rs = $this->retrieve_elements();
$rs = $this->retrieve_elements();
$items = array();
foreach ($rs as $item_id)
{
@@ -444,11 +443,11 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
}
$sql = 'SELECT id FROM feed_entry_elements
$sql = 'SELECT id FROM feed_entry_elements
WHERE entry_id = :entry_id ORDER BY ord ASC';
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute(array(':entry_id' => $this->get_id()));
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$items = array();
@@ -474,7 +473,7 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
$content->delete();
}
$sql = 'DELETE FROM feed_entries WHERE id = :entry_id';
$sql = 'DELETE FROM feed_entries WHERE id = :entry_id';
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute(array(':entry_id' => $this->get_id()));
$stmt->closeCursor();
@@ -515,12 +514,12 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
, :description, NOW(), NOW(), :author_name, :author_email)';
$params = array(
':feed_id' => $feed->get_id()
, ':publisher_id' => $publisher->get_id()
, ':title' => trim($title)
, ':description' => trim($subtitle)
, ':author_name' => trim($author_name)
, ':author_email' => trim($author_mail)
':feed_id' => $feed->get_id()
, ':publisher_id' => $publisher->get_id()
, ':title' => trim($title)
, ':description' => trim($subtitle)
, ':author_name' => trim($author_name)
, ':author_email' => trim($author_mail)
);
$stmt = $appbox->get_connection()->prepare($sql);
@@ -531,7 +530,12 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
$feed->delete_data_from_cache();
return new self($appbox, $feed, $entry_id);
$entry = new self($appbox, $feed, $entry_id);
$eventsmanager = \eventsmanager_broker::getInstance($appbox);
$eventsmanager->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry_id), $entry);
return $entry;
}
/**
@@ -542,10 +546,10 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
*/
public static function load_from_id(appbox $appbox, $id)
{
$sql = 'SELECT feed_id FROM feed_entries WHERE id = :entry_id';
$sql = 'SELECT feed_id FROM feed_entries WHERE id = :entry_id';
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(array(':entry_id' => $id));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor();
if (!$row)

2
lib/classes/User/Adapter.class.php
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);

2
lib/classes/eventsmanager/broker.class.php
View File

@@ -27,7 +27,7 @@ class eventsmanager_broker
}
/**
* @return eventsmanager
* @return \eventsmanager_broker
*/
public static function getInstance(appbox &$appbox, \Alchemy\Phrasea\Core $core)
{

208
lib/classes/eventsmanager/notify/feed.class.php Normal file
View File

@@ -0,0 +1,208 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2010 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
*
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
{
/**
*
* @var string
*/
public $events = array('__FEED_ENTRY_CREATE__');
/**
*
* @return string
*/
public function icon_url()
{
return '/skins/icons/rss16.png';
}
/**
*
* @param string $event
* @param Array $params
* @param mixed content $object
* @return boolean
*/
public function fire($event, $params, &$entry)
{
$params = array(
'entry_id' => $entry->get_id()
);
$dom_xml = new DOMDocument('1.0', 'UTF-8');
$dom_xml->preserveWhiteSpace = false;
$dom_xml->formatOutput = true;
$root = $dom_xml->createElement('datas');
$entry_id = $dom_xml->createElement('entry_id');
$entry_id->appendChild($dom_xml->createTextNode($params['entry_id']));
$root->appendChild($entry_id);
$dom_xml->appendChild($root);
$datas = $dom_xml->saveXml();
$Query = new \User_Query($this->appbox);
$Query->include_phantoms(true)->include_invite(false)->include_templates(false);
if ($entry->get_feed()->get_collection())
{
$Query->on_base_ids(array($entry->get_feed()->get_collection()->get_base_id()));
}
$start = 0;
$perLoop = 100;
$from = array(
'email' => $entry->get_author_email(),
'name' => $entry->get_author_name()
);
do
{
$results = $Query->limit($start, $perLoop)->execute()->get_results();
foreach ($results as $user_to_notif)
{
/* @var $user_to_notif \User_Adapter */
$mailed = false;
$send_notif = ($this->get_prefs(__CLASS__, $user_to_notif->get_id()) != '0');
if ($send_notif)
{
$email = array(
'email' => $user_to_notif->get_email(),
'name' => $user_to_notif->get_display_name()
);
$token = \random::getUrlToken(
\random::TYPE_FEED_ENTRY
, $user_to_notif->get_id()
, null
, $entry->get_id()
);
$url = $this->appbox->get_registry()->get('GV_ServerName') . 'lightbox/index.php?LOG=' . $token;
if (self::mail($email, $from, $url, $entry))
$mailed = true;
}
$this->broker->notify($user_to_notif->get_id(), __CLASS__, $datas, $mailed);
}
$start += $perLoop;
}
while (count($results) > 0);
return true;
}
/**
*
* @param Array $datas
* @param boolean $unread
* @return Array
*/
public function datas($datas, $unread)
{
$sx = simplexml_load_string($datas);
try
{
$entry = \Feed_Entry_Adapter::load_from_id($this->appbox, (int) $sx->entry_id);
}
catch (\Exception $e)
{
return array();
}
$ret = array(
'text' => sprintf(
_('%1$s has published %2$s')
, $entry->get_author_name()
, '<a href="/lightbox/feeds/entry/' . $entry->get_id() . '/" target="_blank">' . $entry->get_title() . '</a>'
)
, 'class' => ($unread == 1 ? 'reload_baskets' : '')
);
return $ret;
}
/**
*
* @return string
*/
public function get_name()
{
return _('Feeds');
}
/**
*
* @return string
*/
public function get_description()
{
return _('Recevoir des notifications lorsqu\'on me push quelque chose');
}
/**
*
* @return boolean
*/
function is_available()
{
return true;
}
/**
*
* @param Array $to
* @param Array $from
* @param string $message
* @param string $url
* @param boolean $accuse
* @return boolean
*/
function mail($to, $from, $url, \Feed_Entry_Adapter $entry)
{
$subject = sprintf(_('Nouvelle publication : %s'), $entry->get_title());
$body = "<div>"
. sprintf('%s vient de publier %s', $entry->get_author_name(), $entry->get_title())
. _('Connectez vous a l\'adresse suivante pour la consulter')
. "</div>\n";
$body .= '<div><a href="' . $url . '">' . $url . "</a></div>\n";
$body .= " <br/> ";
$body .= "<br/>\n<br/>\n<br/>\n"
. _('push::atention: ce lien est unique et son contenu confidentiel, ne divulguez pas');
return mail::send_mail($subject, $body, $to, $from, array());
}
}

18
lib/classes/gatekeeper.class.php
View File

@@ -79,7 +79,6 @@ class gatekeeper
$session = $appbox->get_session();
if (http_request::is_command_line())
return;
if (isset($_SERVER['PHP_SELF']) && trim($_SERVER['PHP_SELF']))
@@ -141,7 +140,6 @@ class gatekeeper
break;
case 'admin':
if ($this->_script_name === 'runscheduler.php')
return;
phrasea::redirect('/login/?redirect=' . $_SERVER['REQUEST_URI']);
break;
@@ -161,7 +159,6 @@ class gatekeeper
return;
case 'setup':
if ($appbox->upgradeavailable())
return;
else
phrasea::redirect('/login/');
@@ -278,7 +275,6 @@ class gatekeeper
$parm = $request->get_parms('LOG');
if (is_null($parm["LOG"]))
return $this;
try
@@ -297,7 +293,19 @@ class gatekeeper
{
$datas = random::helloToken($parm['LOG']);
return phrasea::redirect("/lightbox/validate/" . $datas['datas'] . "/");
switch ($datas['type'])
{
default:
return $this;
break;
case \random::TYPE_FEED_ENTRY:
return phrasea::redirect("/lightbox/feeds/entry/" . $datas['datas'] . "/");
break;
case \random::TYPE_VALIDATE:
case \random::TYPE_VIEW:
return phrasea::redirect("/lightbox/validate/" . $datas['datas'] . "/");
break;
}
}
catch (Exception_NotFound $e)
{

4
lib/classes/mail.class.php
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');

72
lib/classes/random.class.php
View File

@@ -11,18 +11,28 @@
class random
{
/**
*
*/
const NUMBERS = "0123456789";
const NUMBERS = "0123456789";
/**
*
*/
const LETTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
const LETTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
/**
*
*/
const LETTERS_AND_NUMBERS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
const TYPE_FEED_ENTRY = 'FEED_ENTRY';
const TYPE_PASSWORD = 'password';
const TYPE_DOWNLOAD = 'download';
const TYPE_MAIL_DOWNLOAD = 'mail-download';
const TYPE_EMAIL = 'email';
const TYPE_VIEW = 'view';
const TYPE_VALIDATE = 'validate';
const TYPE_RSS = 'rss';
/**
*
@@ -34,15 +44,15 @@ class random
{
$conn = connection::getPDOConnection();
$date = new DateTime();
$date = phraseadate::format_mysql($date);
$date = new DateTime();
$date = phraseadate::format_mysql($date);
$registry = registry::get_instance();
$sql = 'SELECT * FROM tokens WHERE expire_on < :date
$sql = 'SELECT * FROM tokens WHERE expire_on < :date
AND datas IS NOT NULL AND (type="download" OR type="email")';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':date' => $date));
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
foreach ($rs as $row)
{
@@ -57,7 +67,7 @@ class random
}
}
$sql = 'DELETE FROM tokens WHERE expire_on < :date and (type="download" OR type="email")';
$sql = 'DELETE FROM tokens WHERE expire_on < :date and (type="download" OR type="email")';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':date' => $date));
$stmt->closeCursor();
@@ -85,8 +95,8 @@ class random
$password = "";
if (!in_array($possible, array(self::LETTERS_AND_NUMBERS, self::LETTERS, self::NUMBERS)))
$possible = self::LETTERS_AND_NUMBERS;
$i = 0;
$possible = self::LETTERS_AND_NUMBERS;
$i = 0;
$possible_length = strlen($possible);
while ($i < $length)
{
@@ -106,18 +116,32 @@ class random
* @param mixed content $datas
* @return boolean
*/
public static function getUrlToken($type, $usr, DateTime $end_date = null, $datas='')
public static function getUrlToken($type, $usr, DateTime $end_date = null, $datas = '')
{
self::cleanTokens();
$conn = connection::getPDOConnection();
$token = $test = false;
$conn = connection::getPDOConnection();
$token = $test = false;
if (!in_array($type, array('password', 'download', 'mail-download', 'email', 'view', 'validate', 'rss')))
throw new Exception_InvalidArgument();
switch ($type)
{
case self::TYPE_DOWNLOAD:
case self::TYPE_PASSWORD:
case self::TYPE_MAIL_DOWNLOAD:
case self::TYPE_EMAIL:
case self::TYPE_VALIDATE:
case self::TYPE_VIEW:
case self::TYPE_RSS:
case self::TYPE_FEED_ENTRY:
break;
default:
throw new Exception_InvalidArgument();
break;
}
$n = 1;
$sql = 'SELECT id FROM tokens WHERE value = :test ';
$sql = 'SELECT id FROM tokens WHERE value = :test ';
$stmt = $conn->prepare($sql);
while ($n < 100)
{
@@ -134,16 +158,16 @@ class random
if ($token)
{
$sql = 'INSERT INTO tokens (id, value, type, usr_id, created_on, expire_on, datas)
$sql = 'INSERT INTO tokens (id, value, type, usr_id, created_on, expire_on, datas)
VALUES (null, :token, :type, :usr, NOW(), :end_date, :datas)';
$stmt = $conn->prepare($sql);
$params = array(
':token' => $token
, ':type' => $type
, ':usr' => ($usr ? $usr : '-1')
, ':end_date' => ($end_date instanceof DateTime ? phraseadate::format_mysql($end_date) : null)
, ':datas' => ((trim($datas) != '') ? $datas : null)
':token' => $token
, ':type' => $type
, ':usr' => ($usr ? $usr : '-1')
, ':end_date' => ($end_date instanceof DateTime ? phraseadate::format_mysql($end_date) : null)
, ':datas' => ((trim($datas) != '') ? $datas : null)
);
$stmt->execute($params);
$stmt->closeCursor();
@@ -159,7 +183,7 @@ class random
try
{
$conn = connection::getPDOConnection();
$sql = 'DELETE FROM tokens WHERE value = :token';
$sql = 'DELETE FROM tokens WHERE value = :token';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':token' => $token));
$stmt->closeCursor();
@@ -202,12 +226,12 @@ class random
self::cleanTokens();
$conn = connection::getPDOConnection();
$sql = 'SELECT * FROM tokens
$sql = 'SELECT * FROM tokens
WHERE value = :token
AND (expire_on > NOW() OR expire_on IS NULL)';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':token' => $token));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor();
if (!$row)

2
lib/conf.d/bases_structure.xml
View File

@@ -3816,7 +3816,7 @@
</field>
<field>
<name>type</name>
<type>enum('view','validate','password','rss','email','download')</type>
<type>enum('FEED_ENTRY', 'view','validate','password','rss','email','download')</type>
<null></null>
<extra></extra>
<collation>ascii_bin</collation>

10
lib/unitTest/randomTest.php
View File

@@ -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
{

13
lib/unitTest/record/adapterTest.php
View File

@@ -384,7 +384,18 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
$this->assertEquals(1, count($current_fields));
$field = $current_fields[0];
$multi_imploded = implode(' ' . $meta_el->get_separator() . ' ', array('un', 'jeu', 'de', 'test'));
$separator = $meta_el->get_separator();
if(strlen($separator) > 0)
{
$separator = $separator[0];
}
else
{
$separator = '';
}
$multi_imploded = implode(' ' . $separator . ' ', array('un', 'jeu', 'de', 'test'));
if ($meta_el->is_multi())
{

2
www/include/download.php
View File

@@ -56,7 +56,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)
{

2
www/include/sendmailpage.php
View File

@@ -61,7 +61,7 @@ $list['email'] = $Request->get("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));
//GET EMAILS

2
www/login/authenticate.php
View File

@@ -108,7 +108,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';

2
www/login/forgotpwd.php
View File

@@ -46,7 +46,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)
{

10
www/prod/page0.js
View File

@@ -3163,7 +3163,17 @@ function set_up_feed_box(data)
url: $form.attr('action'),
data: $form.serializeArray(),
dataType:'json',
beforeSend:function(){
$('button', $feed_box).attr('disabled', 'disabled');
},
error:function(){
$('button', $feed_box).removeAttr('disabled');
},
timeout:function(){
$('button', $feed_box).removeAttr('disabled');
},
success: function(data){
$('button', $feed_box).removeAttr('disabled');
if(data.error === true)
{
alert(data.message);