diff options
author | Andrew Dolgov <[email protected]> | 2017-12-03 09:35:59 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-12-03 09:35:59 +0300 |
commit | 187abfe732fe62cf4b30847665dab30903d00d99 (patch) | |
tree | 1a0b4084e8b6a38bd6cf937368819b737747e995 /classes/pref | |
parent | 8ff3cbb32e8fcae1e8ce7d83e5718f43afaacdb8 (diff) |
main classes: remove sql_bool_to_bool() kludge
Diffstat (limited to 'classes/pref')
-rwxr-xr-x | classes/pref/feeds.php | 14 | ||||
-rw-r--r-- | classes/pref/prefs.php | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index fcd2aedad..9f7ada244 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -510,7 +510,7 @@ class Pref_Feeds extends Handler_Protected { print '<div dojoType="dijit.layout.TabContainer" style="height : 450px"> <div dojoType="dijit.layout.ContentPane" title="'.__('General').'">'; - $auth_pass_encrypted = sql_bool_to_bool($row["auth_pass_encrypted"]); + $auth_pass_encrypted = $row["auth_pass_encrypted"]; $title = htmlspecialchars($row["title"]); @@ -644,7 +644,7 @@ class Pref_Feeds extends Handler_Protected { //print "<div class=\"dlgSec\">".__("Options")."</div>"; print "<div class=\"dlgSecSimple\">"; - $private = sql_bool_to_bool($row["private"]); + $private = $row["private"]; if ($private) { $checked = "checked=\"1\""; @@ -655,7 +655,7 @@ class Pref_Feeds extends Handler_Protected { print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\" $checked> <label for=\"private\">".__('Hide from Popular feeds')."</label>"; - $include_in_digest = sql_bool_to_bool($row["include_in_digest"]); + $include_in_digest = $row["include_in_digest"]; if ($include_in_digest) { $checked = "checked=\"1\""; @@ -668,7 +668,7 @@ class Pref_Feeds extends Handler_Protected { $checked> <label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>"; - $always_display_enclosures = sql_bool_to_bool($row["always_display_enclosures"]); + $always_display_enclosures = $row["always_display_enclosures"]; if ($always_display_enclosures) { $checked = "checked"; @@ -680,7 +680,7 @@ class Pref_Feeds extends Handler_Protected { name=\"always_display_enclosures\" $checked> <label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>"; - $hide_images = sql_bool_to_bool($row["hide_images"]); + $hide_images = $row["hide_images"]; if ($hide_images) { $checked = "checked=\"1\""; @@ -693,7 +693,7 @@ class Pref_Feeds extends Handler_Protected { $checked> <label for=\"hide_images\">". __('Do not embed images')."</label>"; - $cache_images = sql_bool_to_bool($row["cache_images"]); + $cache_images = $row["cache_images"]; if ($cache_images) { $checked = "checked=\"1\""; @@ -706,7 +706,7 @@ class Pref_Feeds extends Handler_Protected { $checked> <label for=\"cache_images\">". __('Cache media')."</label>"; - $mark_unread_on_update = sql_bool_to_bool($row["mark_unread_on_update"]); + $mark_unread_on_update = $row["mark_unread_on_update"]; if ($mark_unread_on_update) { $checked = "checked"; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index ab39b1e28..ff778cbce 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -207,7 +207,7 @@ class Pref_Prefs extends Handler_Protected { $email = htmlspecialchars($row["email"]); $full_name = htmlspecialchars($row["full_name"]); - $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); + $otp_enabled = $row["otp_enabled"]; print "<tr><td width=\"40%\">".__('Full name')."</td>"; print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"full_name\" required=\"1\" @@ -864,7 +864,7 @@ class Pref_Prefs extends Handler_Protected { $base32 = new Base32(); $login = $row["login"]; - $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); + $otp_enabled = $row["otp_enabled"]; if (!$otp_enabled) { $secret = $base32->encode(sha1($row["salt"])); |