summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/feeds.php8
-rwxr-xr-xclasses/handler/public.php2
-rwxr-xr-xclasses/pref/feeds.php25
-rwxr-xr-xclasses/pref/filters.php2
-rw-r--r--classes/pref/prefs.php6
5 files changed, 22 insertions, 21 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index f7a6aea7b..07677a8cd 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -408,7 +408,7 @@ class Feeds extends Handler_Protected {
if (!$offset && $message) {
$reply['content'] = "<div class='whiteBox'>$message";
- $reply['content'] .= "<p><span class=\"insensitive\">";
+ $reply['content'] .= "<p><span class=\"text-muted\">";
$sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = ?");
@@ -428,7 +428,7 @@ class Feeds extends Handler_Protected {
if ($num_errors > 0) {
$reply['content'] .= "<br/>";
- $reply['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" .
+ $reply['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" .
__('Some feeds have update errors (click for details)') . "</a>";
}
$reply['content'] .= "</span></p></div>";
@@ -585,7 +585,7 @@ class Feeds extends Handler_Protected {
$reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
- $reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
+ $reply['headlines']['content'] .= "<p><span class=\"text-muted\">";
$sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = ?");
@@ -605,7 +605,7 @@ class Feeds extends Handler_Protected {
if ($num_errors > 0) {
$reply['headlines']['content'] .= "<br/>";
- $reply['headlines']['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">".
+ $reply['headlines']['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">".
__('Some feeds have update errors (click for details)')."</a>";
}
$reply['headlines']['content'] .= "</span></p>";
diff --git a/classes/handler/public.php b/classes/handler/public.php
index a8f72e21c..9c6a94c12 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -613,7 +613,7 @@ class Handler_Public extends Handler {
<fieldset>
<button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?php echo __('Share') ?></button>
<button dojoType='dijit.form.Button' onclick="return window.close()"><?php echo __('Cancel') ?></button>
- <span class="insensitive small"><?php echo __("Shared article will appear in the Published feed.") ?></span>
+ <span class="text-muted small"><?php echo __("Shared article will appear in the Published feed.") ?></span>
</fieldset>
</form>
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>";
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 03:48:40 +0000