projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use hruid as openid identifier
[platal.git]
/
include
/
rss.inc.php
diff --git
a/include/rss.inc.php
b/include/rss.inc.php
index
3b07d78
..
e45a822
100644
(file)
--- a/
include/rss.inc.php
+++ b/
include/rss.inc.php
@@
-19,34
+19,16
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-function _rss_encode_date($d) {
- if (preg_match('/^\d{14}$/', $d)) {
- $t = mktime(substr($d,8,2), substr($d,10,2), substr($d,12,2), substr($d,4,2), substr($d,6,2), substr($d,0,4));
- } else {
- $t = strtotime($d);
- }
- return date('r', $t);
-}
-
function init_rss($template, $alias, $hash, $require_uid = true)
{
$page =& Platal::page();
$page->changeTpl($template, NO_SKIN);
function init_rss($template, $alias, $hash, $require_uid = true)
{
$page =& Platal::page();
$page->changeTpl($template, NO_SKIN);
- $page->register_modifier('rss_date', '_rss_encode_date');
-
- $res = XDB::query(
- 'SELECT a.id
- FROM aliases AS a
- INNER JOIN auth_user_md5 AS u ON (a.id = u.user_id AND u.perms IN ("admin", "user"))
- INNER JOIN auth_user_quick AS q ON (a.id = q.user_id AND q.core_rss_hash = {?})
- WHERE a.alias = {?} AND a.type != "homonyme"', $hash, $alias);
- $uid = $res->fetchOneCell();
-
- if (empty($uid)) {
+ $user = Platal::session()->tokenAuth($alias, $hash);
+ if (is_null($user)) {
if ($require_uid) {
exit;
} else {
if ($require_uid) {
exit;
} else {
- $u
id
= null;
+ $u
ser
= null;
}
}
}
}
@@
-54,7
+36,7
@@
function init_rss($template, $alias, $hash, $require_uid = true)
$page->assign('rss_hash', $hash);
header('Content-Type: application/rss+xml; charset=utf8');
}
$page->assign('rss_hash', $hash);
header('Content-Type: application/rss+xml; charset=utf8');
}
- return
$uid
;
+ return
is_null($user) ? null : $user->id()
;
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: