diff options
Diffstat (limited to 'classes/pref')
| -rwxr-xr-x | classes/pref/feeds.php | 25 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 2 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 6 |
3 files changed, 17 insertions, 16 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index f9ba853f8..e8da85393 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1487,7 +1487,7 @@ class Pref_Feeds extends Handler_Protected { "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". htmlspecialchars($line["title"])."</a>"; - print "</td><td class='insensitive' align='right'>"; + print "</td><td class='text-muted' align='right'>"; print make_local_datetime($line['last_article'], false); print "</td>"; print "</tr>"; @@ -1544,7 +1544,7 @@ class Pref_Feeds extends Handler_Protected { "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". htmlspecialchars($line["title"])."</a>: "; - print "<span class=\"insensitive\">"; + print "<span class=\"text-muted\">"; print htmlspecialchars($line["last_error"]); print "</span>"; @@ -1693,7 +1693,7 @@ class Pref_Feeds extends Handler_Protected { print "</fieldset>"; 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> </footer>"; } @@ -1704,6 +1704,13 @@ class Pref_Feeds extends Handler_Protected { $login = clean($_REQUEST['login']); $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) { $feed = trim($feed); @@ -1711,16 +1718,10 @@ class Pref_Feeds extends Handler_Protected { $this->pdo->beginTransaction(); - $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds - WHERE feed_url = ? AND owner_uid = ?"); - $sth->execute([$feed, $_SESSION['uid']]); - - if (!$sth->fetch()) { - $sth = $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)"); + $csth->execute([$feed, $_SESSION['uid']]); - $sth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]); + if (!$csth->fetch()) { + $isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]); } $this->pdo->commit(); diff --git a/classes/pref/filters.php b/classes/pref/filters.php index f5a580e78..37a7236ee 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -148,7 +148,7 @@ class Pref_Filters extends Handler_Protected { $tmp = "<li><span class='title'>" . $line["title"] . "</span><br/>" . "<span class='feed'>" . $line['feed_title'] . "</span>, <span class='date'>" . mb_substr($line["date_entered"], 0, 16) . "</span>" . - "<div class='preview insensitive'>" . $content_preview . "</div>" . + "<div class='preview text-muted'>" . $content_preview . "</div>" . "</li>"; array_push($rv, $tmp); diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index b611646a9..cb10e2322 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -685,7 +685,7 @@ class Pref_Prefs extends Handler_Protected { } if ($item['help_text']) - print "<div class='help-text insensitive'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; + print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; print "</fieldset>"; } @@ -785,7 +785,7 @@ class Pref_Prefs extends Handler_Protected { print "<fieldset class='prefs plugin'> <label>$name:</label> - <label class='checkbox description insensitive' id='PLABEL-$name'> + <label class='checkbox description text-muted' id='PLABEL-$name'> <input disabled='1' dojoType='dijit.form.CheckBox' $checked type='checkbox'> ".htmlspecialchars($about[1]). "</label>"; @@ -824,7 +824,7 @@ class Pref_Prefs extends Handler_Protected { print "<fieldset class='prefs plugin'> <label>$name:</label> - <label class='checkbox description insensitive' id='PLABEL-$name'> + <label class='checkbox description text-muted' id='PLABEL-$name'> <input name='plugins[]' value='$name' dojoType='dijit.form.CheckBox' $checked $disabled type='checkbox'> ".htmlspecialchars($about[1])."</label>"; |