diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/article.php | 2 | ||||
| -rwxr-xr-x | classes/feeds.php | 12 | ||||
| -rw-r--r-- | classes/pluginhost.php | 1 | ||||
| -rwxr-xr-x | classes/pref/feeds.php | 20 | ||||
| -rw-r--r-- | classes/ttrssmailer.php | 5 |
5 files changed, 17 insertions, 23 deletions
diff --git a/classes/article.php b/classes/article.php index 9a7c68707..46e9bb797 100644 --- a/classes/article.php +++ b/classes/article.php @@ -209,7 +209,7 @@ class Article extends Handler_Protected { print "<table width='100%'><tr><td>"; print "<textarea dojoType=\"dijit.form.SimpleTextarea\" rows='4' - style='font-size : 12px; width : 98%' id=\"tags_str\" + style='height : 100px; font-size : 12px; width : 98%' id=\"tags_str\" name='tags_str'>$tags_str</textarea> <div class=\"autocomplete\" id=\"tags_choices\" style=\"display:none\"></div>"; diff --git a/classes/feeds.php b/classes/feeds.php index afbeb249b..8f101e5cb 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -86,17 +86,23 @@ class Feeds extends Handler_Protected { $reply .= "<span class=\"main\">"; $reply .= "<span id='selected_prompt'></span>"; - $reply .= "<span class=\"sel_links\"> + /*$reply .= "<span class=\"sel_links\"> <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>, <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>, <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>, <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>"; - $reply .= "</span> "; + $reply .= "</span> "; */ $reply .= "<select dojoType=\"dijit.form.Select\" onchange=\"headlineActionsChange(this)\">"; - $reply .= "<option value=\"false\">".__('More...')."</option>"; + + $reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>"; + + $reply .= "<option value=\"$sel_all_link\">".__('All')."</option>"; + $reply .= "<option value=\"$sel_unread_link\">".__('Unread')."</option>"; + $reply .= "<option value=\"$sel_inv_link\">".__('Invert')."</option>"; + $reply .= "<option value=\"$sel_none_link\">".__('None')."</option>"; $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>"; diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 675e0af17..82565257a 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -50,6 +50,7 @@ class PluginHost { const HOOK_RENDER_ENCLOSURE = 29; const HOOK_ARTICLE_FILTER_ACTION = 30; const HOOK_ARTICLE_EXPORT_FEED = 31; + const HOOK_MAIN_TOOLBAR_BUTTON = 32; const KIND_ALL = 1; const KIND_SYSTEM = 2; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 2803d68ec..6795236d5 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -646,7 +646,7 @@ class Pref_Feeds extends Handler_Protected { $auth_pass = $this->dbh->fetch_result($result, 0, "auth_pass"); - if ($auth_pass_encrypted) { + if ($auth_pass_encrypted && function_exists("mcrypt_decrypt")) { require_once "crypt.php"; $auth_pass = decrypt_string($auth_pass); } @@ -983,14 +983,7 @@ class Pref_Feeds extends Handler_Protected { $feed_language = $this->dbh->escape_string(trim($_POST["feed_language"])); - if (strlen(FEED_CRYPT_KEY) > 0) { - require_once "crypt.php"; - $auth_pass = substr(encrypt_string($auth_pass), 0, 250); - $auth_pass_encrypted = 'true'; - } else { - $auth_pass_encrypted = 'false'; - } - + $auth_pass_encrypted = 'false'; $auth_pass = $this->dbh->escape_string($auth_pass); if (get_pref('ENABLE_FEED_CATS')) { @@ -1889,14 +1882,7 @@ class Pref_Feeds extends Handler_Protected { "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]); - if (strlen(FEED_CRYPT_KEY) > 0) { - require_once "crypt.php"; - $pass = substr(encrypt_string($pass), 0, 250); - $auth_pass_encrypted = 'true'; - } else { - $auth_pass_encrypted = 'false'; - } - + $auth_pass_encrypted = 'false'; $pass = $this->dbh->escape_string($pass); if ($this->dbh->num_rows($result) == 0) { diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php index 64e8a59a7..4029bbbdb 100644 --- a/classes/ttrssmailer.php +++ b/classes/ttrssmailer.php @@ -7,6 +7,7 @@ *
*/
require_once 'lib/phpmailer/class.phpmailer.php';
+require_once 'lib/phpmailer/class.smtp.php';
require_once "config.php";
class ttrssMailer extends PHPMailer {
@@ -41,8 +42,8 @@ class ttrssMailer extends PHPMailer { $this->Username = SMTP_LOGIN;
$this->Password = SMTP_PASSWORD;
}
- if(SMTP_SECURE) - $this->SMTPSecure = SMTP_SECURE; + if(SMTP_SECURE)
+ $this->SMTPSecure = SMTP_SECURE;
}
/* @brief a simple mail function to send email using the defaults
* This will send an HTML email using the configured defaults
|