batch subscribe: stop dialog from being submitted twice
This commit is contained in:
parent
a34509c8ae
commit
241d646fba
|
@ -1693,7 +1693,7 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
print "</fieldset>";
|
print "</fieldset>";
|
||||||
|
|
||||||
print "<footer>
|
print "<footer>
|
||||||
<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"return dijit.byId('batchSubDlg').execute()\">".__('Subscribe')."</button>
|
<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__('Subscribe')."</button>
|
||||||
<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
|
<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
|
||||||
</footer>";
|
</footer>";
|
||||||
}
|
}
|
||||||
|
@ -1704,6 +1704,13 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
$login = clean($_REQUEST['login']);
|
$login = clean($_REQUEST['login']);
|
||||||
$pass = trim(clean($_REQUEST['pass']));
|
$pass = trim(clean($_REQUEST['pass']));
|
||||||
|
|
||||||
|
$csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
|
||||||
|
WHERE feed_url = ? AND owner_uid = ?");
|
||||||
|
|
||||||
|
$isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
|
||||||
|
(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted)
|
||||||
|
VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)");
|
||||||
|
|
||||||
foreach ($feeds as $feed) {
|
foreach ($feeds as $feed) {
|
||||||
$feed = trim($feed);
|
$feed = trim($feed);
|
||||||
|
|
||||||
|
@ -1711,16 +1718,10 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
|
|
||||||
$this->pdo->beginTransaction();
|
$this->pdo->beginTransaction();
|
||||||
|
|
||||||
$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
|
$csth->execute([$feed, $_SESSION['uid']]);
|
||||||
WHERE feed_url = ? AND owner_uid = ?");
|
|
||||||
$sth->execute([$feed, $_SESSION['uid']]);
|
|
||||||
|
|
||||||
if (!$sth->fetch()) {
|
if (!$csth->fetch()) {
|
||||||
$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
|
$isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
|
||||||
(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted)
|
|
||||||
VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)");
|
|
||||||
|
|
||||||
$sth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->pdo->commit();
|
$this->pdo->commit();
|
||||||
|
|
Loading…
Reference in New Issue