make published OPML use common secret key code
This commit is contained in:
parent
f29033f86c
commit
2e7f046f65
|
@ -5763,7 +5763,7 @@
|
|||
|
||||
$url_path = get_self_url_prefix();
|
||||
$url_path .= "/opml.php?op=publish&key=" .
|
||||
get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
|
||||
get_feed_access_key($link, 'OPML:Publish', false, $_SESSION["uid"]);
|
||||
|
||||
return $url_path;
|
||||
}
|
||||
|
|
|
@ -467,8 +467,10 @@
|
|||
if ($subop == "regenOPMLKey") {
|
||||
|
||||
print "<rpc-reply>";
|
||||
set_pref($link, "_PREFS_PUBLISH_KEY",
|
||||
sha1(uniqid(rand(), true)), $_SESSION["uid"]);
|
||||
|
||||
update_feed_access_key($link, 'OPML:Publish',
|
||||
false, $_SESSION["uid"]);
|
||||
|
||||
$new_link = opml_publish_url($link);
|
||||
print "<link><![CDATA[$new_link]]></link>";
|
||||
print "</rpc-reply>";
|
||||
|
|
|
@ -163,10 +163,6 @@
|
|||
print "<div id=\"infoBoxTitle\">".__('Public OPML URL')."</div>";
|
||||
print "<div class=\"infoBoxContents\">";
|
||||
|
||||
if (!get_pref($link, "_PREFS_PUBLISH_KEY"))
|
||||
set_pref($link, "_PREFS_PUBLISH_KEY",
|
||||
sha1(uniqid(rand(), true)));
|
||||
|
||||
$url_path = opml_publish_url($link);
|
||||
|
||||
print __("Your Public OPML URL is:");
|
||||
|
|
12
opml.php
12
opml.php
|
@ -134,15 +134,13 @@
|
|||
if ($op == "publish"){
|
||||
$key = db_escape_string($_REQUEST["key"]);
|
||||
|
||||
$result = db_query($link, "SELECT login, owner_uid
|
||||
FROM ttrss_user_prefs, ttrss_users WHERE
|
||||
pref_name = '_PREFS_PUBLISH_KEY' AND
|
||||
value = '$key' AND
|
||||
ttrss_users.id = owner_uid");
|
||||
$result = db_query($link, "SELECT owner_uid
|
||||
FROM ttrss_access_keys WHERE
|
||||
access_key = '$key' AND feed_id = 'OPML:Publish'");
|
||||
|
||||
if (db_num_rows($result) == 1) {
|
||||
$owner = db_fetch_result($result, 0, "owner_uid");
|
||||
return opml_export($link, $owner, true, false);
|
||||
$owner_uid = db_fetch_result($result, 0, "owner_uid");
|
||||
return opml_export($link, $owner_uid, true, false);
|
||||
} else {
|
||||
print "<error>User not found</error>";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue