diff options
Diffstat (limited to 'classes/rpc.php')
| -rwxr-xr-x | classes/rpc.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/classes/rpc.php b/classes/rpc.php index 0e881b3ce..9f86c9401 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -15,7 +15,7 @@ class RPC extends Handler_Protected { } function remprofiles() { - $ids = explode(",", trim(clean($_REQUEST["ids"]))); + $ids = explode(",", clean($_REQUEST["ids"])); foreach ($ids as $id) { if ($_SESSION["profile"] != $id) { @@ -28,7 +28,7 @@ class RPC extends Handler_Protected { // Silent function addprofile() { - $title = trim(clean($_REQUEST["title"])); + $title = clean($_REQUEST["title"]); if ($title) { $this->pdo->beginTransaction(); @@ -63,7 +63,7 @@ class RPC extends Handler_Protected { function saveprofile() { $id = clean($_REQUEST["id"]); - $title = trim(clean($_REQUEST["value"])); + $title = clean($_REQUEST["value"]); if ($id == 0) { print __("Default profile"); @@ -85,7 +85,7 @@ class RPC extends Handler_Protected { $cat = clean($_REQUEST['cat']); $need_auth = isset($_REQUEST['need_auth']); $login = $need_auth ? clean($_REQUEST['login']) : ''; - $pass = $need_auth ? trim(clean($_REQUEST['pass'])) : ''; + $pass = $need_auth ? clean($_REQUEST['pass']) : ''; $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass); @@ -244,7 +244,7 @@ class RPC extends Handler_Protected { function setpanelmode() { $wide = (int) clean($_REQUEST["wide"]); - setcookie("ttrss_widescreen", $wide, + setcookie("ttrss_widescreen", (string)$wide, time() + COOKIE_LIFETIME_LONG); print json_encode(array("wide" => $wide)); @@ -462,7 +462,7 @@ class RPC extends Handler_Protected { $params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY"); $params["bw_limit"] = (int) $_SESSION["bw_limit"]; $params["is_default_pw"] = Pref_Prefs::isdefaultpassword(); - $params["label_base_index"] = (int) LABEL_BASE_INDEX; + $params["label_base_index"] = LABEL_BASE_INDEX; $theme = get_pref( "USER_CSS_THEME", false, false); $params["theme"] = theme_exists($theme) ? $theme : ""; @@ -488,9 +488,9 @@ class RPC extends Handler_Protected { $params["hotkeys"] = $this->get_hotkeys_map(); - $params["widescreen"] = (int) $_COOKIE["ttrss_widescreen"]; + $params["widescreen"] = (int) ($_COOKIE["ttrss_widescreen"] ?? 0); - $params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE; + $params['simple_update'] = SIMPLE_UPDATE_MODE; $params["icon_indicator_white"] = $this->image_to_base64("images/indicator_white.gif"); @@ -503,7 +503,7 @@ class RPC extends Handler_Protected { if (file_exists($filename)) { $ext = pathinfo($filename, PATHINFO_EXTENSION); - return "data:image/$ext;base64," . base64_encode(file_get_contents($filename)); + return "data:image/$ext;base64," . base64_encode((string)file_get_contents($filename)); } else { return ""; } @@ -546,7 +546,7 @@ class RPC extends Handler_Protected { $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock"); - if (time() - $_SESSION["daemon_stamp_check"] > 30) { + if (time() - ($_SESSION["daemon_stamp_check"] ?? 0) > 30) { $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp"); @@ -719,7 +719,7 @@ class RPC extends Handler_Protected { $prefixes = array(); foreach (array_keys($hotkeys) as $hotkey) { - $pair = explode(" ", $hotkey, 2); + $pair = explode(" ", (string)$hotkey, 2); if (count($pair) > 1 && !in_array($pair[0], $prefixes)) { array_push($prefixes, $pair[0]); |