@@ -38,7 +38,7 @@ |
||
38 | 38 | return 0; |
39 | 39 | } |
40 | 40 | |
41 | - $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ]; |
|
41 | + $headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"]; |
|
42 | 42 | |
43 | 43 | return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); |
44 | 44 | } |
@@ -19,8 +19,9 @@ discard block |
||
19 | 19 | $from_combined = $from_name ? "$from_name <$from_address>" : $from_address; |
20 | 20 | $to_combined = $to_name ? "$to_name <$to_address>" : $to_address; |
21 | 21 | |
22 | - if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) |
|
23 | - Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message"); |
|
22 | + if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) { |
|
23 | + Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message"); |
|
24 | + } |
|
24 | 25 | |
25 | 26 | // HOOK_SEND_MAIL plugin instructions: |
26 | 27 | // 1. return 1 or true if mail is handled |
@@ -31,11 +32,13 @@ discard block |
||
31 | 32 | foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { |
32 | 33 | $rc = $p->hook_send_mail($this, $params); |
33 | 34 | |
34 | - if ($rc == 1) |
|
35 | - return $rc; |
|
35 | + if ($rc == 1) { |
|
36 | + return $rc; |
|
37 | + } |
|
36 | 38 | |
37 | - if ($rc == -1) |
|
38 | - return 0; |
|
39 | + if ($rc == -1) { |
|
40 | + return 0; |
|
41 | + } |
|
39 | 42 | } |
40 | 43 | |
41 | 44 | $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ]; |
@@ -1,52 +1,52 @@ |
||
1 | 1 | <?php |
2 | 2 | class Mailer { |
3 | - // TODO: support HTML mail (i.e. MIME messages) |
|
3 | + // TODO: support HTML mail (i.e. MIME messages) |
|
4 | 4 | |
5 | - private $last_error = "Unable to send mail: check local configuration."; |
|
5 | + private $last_error = "Unable to send mail: check local configuration."; |
|
6 | 6 | |
7 | - public function mail($params) { |
|
7 | + public function mail($params) { |
|
8 | 8 | |
9 | - $to_name = $params["to_name"]; |
|
10 | - $to_address = $params["to_address"]; |
|
11 | - $subject = $params["subject"]; |
|
12 | - $message = $params["message"]; |
|
13 | - $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME; |
|
14 | - $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS; |
|
9 | + $to_name = $params["to_name"]; |
|
10 | + $to_address = $params["to_address"]; |
|
11 | + $subject = $params["subject"]; |
|
12 | + $message = $params["message"]; |
|
13 | + $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME; |
|
14 | + $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS; |
|
15 | 15 | |
16 | - $additional_headers = $params["headers"] ? $params["headers"] : []; |
|
16 | + $additional_headers = $params["headers"] ? $params["headers"] : []; |
|
17 | 17 | |
18 | - $from_combined = $from_name ? "$from_name <$from_address>" : $from_address; |
|
19 | - $to_combined = $to_name ? "$to_name <$to_address>" : $to_address; |
|
18 | + $from_combined = $from_name ? "$from_name <$from_address>" : $from_address; |
|
19 | + $to_combined = $to_name ? "$to_name <$to_address>" : $to_address; |
|
20 | 20 | |
21 | - if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) |
|
22 | - Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message"); |
|
21 | + if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) |
|
22 | + Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message"); |
|
23 | 23 | |
24 | - // HOOK_SEND_MAIL plugin instructions: |
|
25 | - // 1. return 1 or true if mail is handled |
|
26 | - // 2. return -1 if there's been a fatal error and no further action is allowed |
|
27 | - // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function |
|
28 | - // 4. set error message if needed via passed Mailer instance function set_error() |
|
24 | + // HOOK_SEND_MAIL plugin instructions: |
|
25 | + // 1. return 1 or true if mail is handled |
|
26 | + // 2. return -1 if there's been a fatal error and no further action is allowed |
|
27 | + // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function |
|
28 | + // 4. set error message if needed via passed Mailer instance function set_error() |
|
29 | 29 | |
30 | - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { |
|
31 | - $rc = $p->hook_send_mail($this, $params); |
|
30 | + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { |
|
31 | + $rc = $p->hook_send_mail($this, $params); |
|
32 | 32 | |
33 | - if ($rc == 1) |
|
34 | - return $rc; |
|
33 | + if ($rc == 1) |
|
34 | + return $rc; |
|
35 | 35 | |
36 | - if ($rc == -1) |
|
37 | - return 0; |
|
38 | - } |
|
36 | + if ($rc == -1) |
|
37 | + return 0; |
|
38 | + } |
|
39 | 39 | |
40 | - $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ]; |
|
40 | + $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ]; |
|
41 | 41 | |
42 | - return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); |
|
43 | - } |
|
42 | + return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); |
|
43 | + } |
|
44 | 44 | |
45 | - public function set_error($message) { |
|
46 | - $this->last_error = $message; |
|
47 | - } |
|
45 | + public function set_error($message) { |
|
46 | + $this->last_error = $message; |
|
47 | + } |
|
48 | 48 | |
49 | - public function error() { |
|
50 | - return $this->last_error; |
|
51 | - } |
|
49 | + public function error() { |
|
50 | + return $this->last_error; |
|
51 | + } |
|
52 | 52 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | if ($type_name == "bool") { |
103 | 103 | return $value == "true"; |
104 | 104 | } else if ($type_name == "integer") { |
105 | - return (int)$value; |
|
105 | + return (int) $value; |
|
106 | 106 | } else { |
107 | 107 | return $value; |
108 | 108 | } |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $value = "false"; |
150 | 150 | } |
151 | 151 | } else if ($type_name == "integer") { |
152 | - $value = (int)$value; |
|
152 | + $value = (int) $value; |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | if ($pref_name == 'USER_TIMEZONE' && $value == '') { |
@@ -1,30 +1,30 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | class Db_Prefs { |
3 | - private $pdo; |
|
4 | - private static $instance; |
|
5 | - private $cache; |
|
3 | + private $pdo; |
|
4 | + private static $instance; |
|
5 | + private $cache; |
|
6 | 6 | |
7 | - public function __construct() { |
|
8 | - $this->pdo = Db::pdo(); |
|
9 | - $this->cache = array(); |
|
7 | + public function __construct() { |
|
8 | + $this->pdo = Db::pdo(); |
|
9 | + $this->cache = array(); |
|
10 | 10 | |
11 | - if ($_SESSION["uid"]) $this->cache(); |
|
12 | - } |
|
11 | + if ($_SESSION["uid"]) $this->cache(); |
|
12 | + } |
|
13 | 13 | |
14 | - public static function get() { |
|
15 | - if (self::$instance == null) |
|
16 | - self::$instance = new self(); |
|
14 | + public static function get() { |
|
15 | + if (self::$instance == null) |
|
16 | + self::$instance = new self(); |
|
17 | 17 | |
18 | - return self::$instance; |
|
19 | - } |
|
18 | + return self::$instance; |
|
19 | + } |
|
20 | 20 | |
21 | - public function cache() { |
|
22 | - $user_id = $_SESSION["uid"]; |
|
23 | - @$profile = $_SESSION["profile"]; |
|
21 | + public function cache() { |
|
22 | + $user_id = $_SESSION["uid"]; |
|
23 | + @$profile = $_SESSION["profile"]; |
|
24 | 24 | |
25 | - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
25 | + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
26 | 26 | |
27 | - $sth = $this->pdo->prepare("SELECT |
|
27 | + $sth = $this->pdo->prepare("SELECT |
|
28 | 28 | value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name |
29 | 29 | FROM |
30 | 30 | ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types |
@@ -35,35 +35,35 @@ discard block |
||
35 | 35 | owner_uid = :uid AND |
36 | 36 | ttrss_user_prefs.pref_name = ttrss_prefs.pref_name"); |
37 | 37 | |
38 | - $sth->execute([":profile" => $profile, ":uid" => $user_id]); |
|
38 | + $sth->execute([":profile" => $profile, ":uid" => $user_id]); |
|
39 | 39 | |
40 | - while ($line = $sth->fetch()) { |
|
41 | - if ($user_id == $_SESSION["uid"]) { |
|
42 | - $pref_name = $line["pref_name"]; |
|
40 | + while ($line = $sth->fetch()) { |
|
41 | + if ($user_id == $_SESSION["uid"]) { |
|
42 | + $pref_name = $line["pref_name"]; |
|
43 | 43 | |
44 | - $this->cache[$pref_name]["type"] = $line["type_name"]; |
|
45 | - $this->cache[$pref_name]["value"] = $line["value"]; |
|
46 | - } |
|
47 | - } |
|
48 | - } |
|
44 | + $this->cache[$pref_name]["type"] = $line["type_name"]; |
|
45 | + $this->cache[$pref_name]["value"] = $line["value"]; |
|
46 | + } |
|
47 | + } |
|
48 | + } |
|
49 | 49 | |
50 | - public function read($pref_name, $user_id = false, $die_on_error = false) { |
|
50 | + public function read($pref_name, $user_id = false, $die_on_error = false) { |
|
51 | 51 | |
52 | - if (!$user_id) { |
|
53 | - $user_id = $_SESSION["uid"]; |
|
54 | - @$profile = $_SESSION["profile"]; |
|
55 | - } else { |
|
56 | - $profile = false; |
|
57 | - } |
|
52 | + if (!$user_id) { |
|
53 | + $user_id = $_SESSION["uid"]; |
|
54 | + @$profile = $_SESSION["profile"]; |
|
55 | + } else { |
|
56 | + $profile = false; |
|
57 | + } |
|
58 | 58 | |
59 | - if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) { |
|
60 | - $tuple = $this->cache[$pref_name]; |
|
61 | - return $this->convert($tuple["value"], $tuple["type"]); |
|
62 | - } |
|
59 | + if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) { |
|
60 | + $tuple = $this->cache[$pref_name]; |
|
61 | + return $this->convert($tuple["value"], $tuple["type"]); |
|
62 | + } |
|
63 | 63 | |
64 | - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
64 | + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
65 | 65 | |
66 | - $sth = $this->pdo->prepare("SELECT |
|
66 | + $sth = $this->pdo->prepare("SELECT |
|
67 | 67 | value,ttrss_prefs_types.type_name as type_name |
68 | 68 | FROM |
69 | 69 | ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types |
@@ -73,96 +73,96 @@ discard block |
||
73 | 73 | ttrss_prefs_types.id = type_id AND |
74 | 74 | owner_uid = :uid AND |
75 | 75 | ttrss_user_prefs.pref_name = ttrss_prefs.pref_name"); |
76 | - $sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]); |
|
77 | - |
|
78 | - if ($row = $sth->fetch()) { |
|
79 | - $value = $row["value"]; |
|
80 | - $type_name = $row["type_name"]; |
|
81 | - |
|
82 | - if ($user_id == $_SESSION["uid"]) { |
|
83 | - $this->cache[$pref_name]["type"] = $type_name; |
|
84 | - $this->cache[$pref_name]["value"] = $value; |
|
85 | - } |
|
86 | - |
|
87 | - return $this->convert($value, $type_name); |
|
88 | - |
|
89 | - } else if ($die_on_error) { |
|
90 | - user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR); |
|
91 | - return null; |
|
92 | - } else { |
|
93 | - return null; |
|
94 | - } |
|
95 | - } |
|
96 | - |
|
97 | - public function convert($value, $type_name) { |
|
98 | - if ($type_name == "bool") { |
|
99 | - return $value == "true"; |
|
100 | - } else if ($type_name == "integer") { |
|
101 | - return (int)$value; |
|
102 | - } else { |
|
103 | - return $value; |
|
104 | - } |
|
105 | - } |
|
106 | - |
|
107 | - public function write($pref_name, $value, $user_id = false, $strip_tags = true) { |
|
108 | - if ($strip_tags) $value = strip_tags($value); |
|
109 | - |
|
110 | - if (!$user_id) { |
|
111 | - $user_id = $_SESSION["uid"]; |
|
112 | - @$profile = $_SESSION["profile"]; |
|
113 | - } else { |
|
114 | - $profile = null; |
|
115 | - } |
|
116 | - |
|
117 | - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
118 | - |
|
119 | - $type_name = ""; |
|
120 | - $current_value = ""; |
|
121 | - |
|
122 | - if (isset($this->cache[$pref_name])) { |
|
123 | - $type_name = $this->cache[$pref_name]["type"]; |
|
124 | - $current_value = $this->cache[$pref_name]["value"]; |
|
125 | - } |
|
126 | - |
|
127 | - if (!$type_name) { |
|
128 | - $sth = $this->pdo->prepare("SELECT type_name |
|
76 | + $sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]); |
|
77 | + |
|
78 | + if ($row = $sth->fetch()) { |
|
79 | + $value = $row["value"]; |
|
80 | + $type_name = $row["type_name"]; |
|
81 | + |
|
82 | + if ($user_id == $_SESSION["uid"]) { |
|
83 | + $this->cache[$pref_name]["type"] = $type_name; |
|
84 | + $this->cache[$pref_name]["value"] = $value; |
|
85 | + } |
|
86 | + |
|
87 | + return $this->convert($value, $type_name); |
|
88 | + |
|
89 | + } else if ($die_on_error) { |
|
90 | + user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR); |
|
91 | + return null; |
|
92 | + } else { |
|
93 | + return null; |
|
94 | + } |
|
95 | + } |
|
96 | + |
|
97 | + public function convert($value, $type_name) { |
|
98 | + if ($type_name == "bool") { |
|
99 | + return $value == "true"; |
|
100 | + } else if ($type_name == "integer") { |
|
101 | + return (int)$value; |
|
102 | + } else { |
|
103 | + return $value; |
|
104 | + } |
|
105 | + } |
|
106 | + |
|
107 | + public function write($pref_name, $value, $user_id = false, $strip_tags = true) { |
|
108 | + if ($strip_tags) $value = strip_tags($value); |
|
109 | + |
|
110 | + if (!$user_id) { |
|
111 | + $user_id = $_SESSION["uid"]; |
|
112 | + @$profile = $_SESSION["profile"]; |
|
113 | + } else { |
|
114 | + $profile = null; |
|
115 | + } |
|
116 | + |
|
117 | + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
118 | + |
|
119 | + $type_name = ""; |
|
120 | + $current_value = ""; |
|
121 | + |
|
122 | + if (isset($this->cache[$pref_name])) { |
|
123 | + $type_name = $this->cache[$pref_name]["type"]; |
|
124 | + $current_value = $this->cache[$pref_name]["value"]; |
|
125 | + } |
|
126 | + |
|
127 | + if (!$type_name) { |
|
128 | + $sth = $this->pdo->prepare("SELECT type_name |
|
129 | 129 | FROM ttrss_prefs,ttrss_prefs_types |
130 | 130 | WHERE pref_name = ? AND type_id = ttrss_prefs_types.id"); |
131 | - $sth->execute([$pref_name]); |
|
132 | - |
|
133 | - if ($row = $sth->fetch()) |
|
134 | - $type_name = $row["type_name"]; |
|
135 | - |
|
136 | - } else if ($current_value == $value) { |
|
137 | - return; |
|
138 | - } |
|
139 | - |
|
140 | - if ($type_name) { |
|
141 | - if ($type_name == "bool") { |
|
142 | - if ($value == "1" || $value == "true") { |
|
143 | - $value = "true"; |
|
144 | - } else { |
|
145 | - $value = "false"; |
|
146 | - } |
|
147 | - } else if ($type_name == "integer") { |
|
148 | - $value = (int)$value; |
|
149 | - } |
|
150 | - |
|
151 | - if ($pref_name == 'USER_TIMEZONE' && $value == '') { |
|
152 | - $value = 'UTC'; |
|
153 | - } |
|
154 | - |
|
155 | - $sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET |
|
131 | + $sth->execute([$pref_name]); |
|
132 | + |
|
133 | + if ($row = $sth->fetch()) |
|
134 | + $type_name = $row["type_name"]; |
|
135 | + |
|
136 | + } else if ($current_value == $value) { |
|
137 | + return; |
|
138 | + } |
|
139 | + |
|
140 | + if ($type_name) { |
|
141 | + if ($type_name == "bool") { |
|
142 | + if ($value == "1" || $value == "true") { |
|
143 | + $value = "true"; |
|
144 | + } else { |
|
145 | + $value = "false"; |
|
146 | + } |
|
147 | + } else if ($type_name == "integer") { |
|
148 | + $value = (int)$value; |
|
149 | + } |
|
150 | + |
|
151 | + if ($pref_name == 'USER_TIMEZONE' && $value == '') { |
|
152 | + $value = 'UTC'; |
|
153 | + } |
|
154 | + |
|
155 | + $sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET |
|
156 | 156 | value = :value WHERE pref_name = :pref_name |
157 | 157 | AND (profile = :profile OR (:profile IS NULL AND profile IS NULL)) |
158 | 158 | AND owner_uid = :uid"); |
159 | 159 | |
160 | - $sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]); |
|
160 | + $sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]); |
|
161 | 161 | |
162 | - if ($user_id == $_SESSION["uid"]) { |
|
163 | - $this->cache[$pref_name]["type"] = $type_name; |
|
164 | - $this->cache[$pref_name]["value"] = $value; |
|
165 | - } |
|
166 | - } |
|
167 | - } |
|
162 | + if ($user_id == $_SESSION["uid"]) { |
|
163 | + $this->cache[$pref_name]["type"] = $type_name; |
|
164 | + $this->cache[$pref_name]["value"] = $value; |
|
165 | + } |
|
166 | + } |
|
167 | + } |
|
168 | 168 | } |
@@ -8,12 +8,15 @@ discard block |
||
8 | 8 | $this->pdo = Db::pdo(); |
9 | 9 | $this->cache = array(); |
10 | 10 | |
11 | - if ($_SESSION["uid"]) $this->cache(); |
|
11 | + if ($_SESSION["uid"]) { |
|
12 | + $this->cache(); |
|
13 | + } |
|
12 | 14 | } |
13 | 15 | |
14 | 16 | public static function get() { |
15 | - if (self::$instance == null) |
|
16 | - self::$instance = new self(); |
|
17 | + if (self::$instance == null) { |
|
18 | + self::$instance = new self(); |
|
19 | + } |
|
17 | 20 | |
18 | 21 | return self::$instance; |
19 | 22 | } |
@@ -22,7 +25,9 @@ discard block |
||
22 | 25 | $user_id = $_SESSION["uid"]; |
23 | 26 | @$profile = $_SESSION["profile"]; |
24 | 27 | |
25 | - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
28 | + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) { |
|
29 | + $profile = null; |
|
30 | + } |
|
26 | 31 | |
27 | 32 | $sth = $this->pdo->prepare("SELECT |
28 | 33 | value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name |
@@ -61,7 +66,9 @@ discard block |
||
61 | 66 | return $this->convert($tuple["value"], $tuple["type"]); |
62 | 67 | } |
63 | 68 | |
64 | - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
69 | + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) { |
|
70 | + $profile = null; |
|
71 | + } |
|
65 | 72 | |
66 | 73 | $sth = $this->pdo->prepare("SELECT |
67 | 74 | value,ttrss_prefs_types.type_name as type_name |
@@ -105,7 +112,9 @@ discard block |
||
105 | 112 | } |
106 | 113 | |
107 | 114 | public function write($pref_name, $value, $user_id = false, $strip_tags = true) { |
108 | - if ($strip_tags) $value = strip_tags($value); |
|
115 | + if ($strip_tags) { |
|
116 | + $value = strip_tags($value); |
|
117 | + } |
|
109 | 118 | |
110 | 119 | if (!$user_id) { |
111 | 120 | $user_id = $_SESSION["uid"]; |
@@ -114,7 +123,9 @@ discard block |
||
114 | 123 | $profile = null; |
115 | 124 | } |
116 | 125 | |
117 | - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; |
|
126 | + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) { |
|
127 | + $profile = null; |
|
128 | + } |
|
118 | 129 | |
119 | 130 | $type_name = ""; |
120 | 131 | $current_value = ""; |
@@ -130,8 +141,9 @@ discard block |
||
130 | 141 | WHERE pref_name = ? AND type_id = ttrss_prefs_types.id"); |
131 | 142 | $sth->execute([$pref_name]); |
132 | 143 | |
133 | - if ($row = $sth->fetch()) |
|
134 | - $type_name = $row["type_name"]; |
|
144 | + if ($row = $sth->fetch()) { |
|
145 | + $type_name = $row["type_name"]; |
|
146 | + } |
|
135 | 147 | |
136 | 148 | } else if ($current_value == $value) { |
137 | 149 | return; |
@@ -126,14 +126,14 @@ |
||
126 | 126 | $tmp = ''; |
127 | 127 | foreach (str_split($keys[$i]) as $c) { |
128 | 128 | switch ($c) { |
129 | - case '*': |
|
130 | - $tmp .= __('Shift') . '+'; |
|
131 | - break; |
|
132 | - case '^': |
|
133 | - $tmp .= __('Ctrl') . '+'; |
|
134 | - break; |
|
135 | - default: |
|
136 | - $tmp .= $c; |
|
129 | + case '*': |
|
130 | + $tmp .= __('Shift') . '+'; |
|
131 | + break; |
|
132 | + case '^': |
|
133 | + $tmp .= __('Ctrl') . '+'; |
|
134 | + break; |
|
135 | + default: |
|
136 | + $tmp .= $c; |
|
137 | 137 | } |
138 | 138 | } |
139 | 139 | $keys[$i] = $tmp; |
@@ -30,7 +30,9 @@ discard block |
||
30 | 30 | $omap = array(); |
31 | 31 | |
32 | 32 | foreach ($imap[1] as $sequence => $action) { |
33 | - if (!isset($omap[$action])) $omap[$action] = array(); |
|
33 | + if (!isset($omap[$action])) { |
|
34 | + $omap[$action] = array(); |
|
35 | + } |
|
34 | 36 | |
35 | 37 | array_push($omap[$action], $sequence); |
36 | 38 | } |
@@ -40,7 +42,9 @@ discard block |
||
40 | 42 | $cur_section = ""; |
41 | 43 | foreach ($info as $section => $hotkeys) { |
42 | 44 | |
43 | - if ($cur_section) print "<li> </li>"; |
|
45 | + if ($cur_section) { |
|
46 | + print "<li> </li>"; |
|
47 | + } |
|
44 | 48 | print "<li><h3>" . $section . "</h3></li>"; |
45 | 49 | $cur_section = $section; |
46 | 50 |
@@ -1,97 +1,97 @@ |
||
1 | 1 | <?php |
2 | 2 | class Backend extends Handler { |
3 | - public function loading() { |
|
4 | - header("Content-type: text/html"); |
|
5 | - print __("Loading, please wait...") . " " . |
|
6 | - "<img src='images/indicator_tiny.gif'>"; |
|
7 | - } |
|
8 | - |
|
9 | - public function digestTest() { |
|
10 | - if (isset($_SESSION['uid'])) { |
|
11 | - header("Content-type: text/html"); |
|
12 | - |
|
13 | - $rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000); |
|
14 | - |
|
15 | - print "<h1>HTML</h1>"; |
|
16 | - print $rv[0]; |
|
17 | - print "<h1>Plain text</h1>"; |
|
18 | - print "<pre>".$rv[3]."</pre>"; |
|
19 | - } else { |
|
20 | - print error_json(6); |
|
21 | - } |
|
22 | - } |
|
23 | - |
|
24 | - public function help() { |
|
25 | - $topic = clean_filename($_REQUEST["topic"]); // only one for now |
|
26 | - |
|
27 | - if ($topic == "main") { |
|
28 | - $info = get_hotkeys_info(); |
|
29 | - $imap = get_hotkeys_map(); |
|
30 | - $omap = array(); |
|
31 | - |
|
32 | - foreach ($imap[1] as $sequence => $action) { |
|
33 | - if (!isset($omap[$action])) $omap[$action] = array(); |
|
34 | - |
|
35 | - array_push($omap[$action], $sequence); |
|
36 | - } |
|
37 | - |
|
38 | - print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>"; |
|
39 | - |
|
40 | - $cur_section = ""; |
|
41 | - foreach ($info as $section => $hotkeys) { |
|
42 | - |
|
43 | - if ($cur_section) print "<li> </li>"; |
|
44 | - print "<li><h3>" . $section . "</h3></li>"; |
|
45 | - $cur_section = $section; |
|
46 | - |
|
47 | - foreach ($hotkeys as $action => $description) { |
|
48 | - |
|
49 | - if (is_array($omap[$action])) { |
|
50 | - foreach ($omap[$action] as $sequence) { |
|
51 | - if (strpos($sequence, "|") !== false) { |
|
52 | - $sequence = substr($sequence, |
|
53 | - strpos($sequence, "|")+1, |
|
54 | - strlen($sequence)); |
|
55 | - } else { |
|
56 | - $keys = explode(" ", $sequence); |
|
57 | - |
|
58 | - for ($i = 0; $i < count($keys); $i++) { |
|
59 | - if (strlen($keys[$i]) > 1) { |
|
60 | - $tmp = ''; |
|
61 | - foreach (str_split($keys[$i]) as $c) { |
|
62 | - switch ($c) { |
|
63 | - case '*': |
|
64 | - $tmp .= __('Shift') . '+'; |
|
65 | - break; |
|
66 | - case '^': |
|
67 | - $tmp .= __('Ctrl') . '+'; |
|
68 | - break; |
|
69 | - default: |
|
70 | - $tmp .= $c; |
|
71 | - } |
|
72 | - } |
|
73 | - $keys[$i] = $tmp; |
|
74 | - } |
|
75 | - } |
|
76 | - $sequence = join(" ", $keys); |
|
77 | - } |
|
78 | - |
|
79 | - print "<li>"; |
|
80 | - print "<div class='hk'><code>$sequence</code></div>"; |
|
81 | - print "<div class='desc'>$description</div>"; |
|
82 | - print "</li>"; |
|
83 | - } |
|
84 | - } |
|
85 | - } |
|
86 | - } |
|
87 | - |
|
88 | - print "</ul>"; |
|
89 | - } |
|
90 | - |
|
91 | - print "<footer class='text-center'>"; |
|
92 | - print "<button dojoType='dijit.form.Button' |
|
3 | + public function loading() { |
|
4 | + header("Content-type: text/html"); |
|
5 | + print __("Loading, please wait...") . " " . |
|
6 | + "<img src='images/indicator_tiny.gif'>"; |
|
7 | + } |
|
8 | + |
|
9 | + public function digestTest() { |
|
10 | + if (isset($_SESSION['uid'])) { |
|
11 | + header("Content-type: text/html"); |
|
12 | + |
|
13 | + $rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000); |
|
14 | + |
|
15 | + print "<h1>HTML</h1>"; |
|
16 | + print $rv[0]; |
|
17 | + print "<h1>Plain text</h1>"; |
|
18 | + print "<pre>".$rv[3]."</pre>"; |
|
19 | + } else { |
|
20 | + print error_json(6); |
|
21 | + } |
|
22 | + } |
|
23 | + |
|
24 | + public function help() { |
|
25 | + $topic = clean_filename($_REQUEST["topic"]); // only one for now |
|
26 | + |
|
27 | + if ($topic == "main") { |
|
28 | + $info = get_hotkeys_info(); |
|
29 | + $imap = get_hotkeys_map(); |
|
30 | + $omap = array(); |
|
31 | + |
|
32 | + foreach ($imap[1] as $sequence => $action) { |
|
33 | + if (!isset($omap[$action])) $omap[$action] = array(); |
|
34 | + |
|
35 | + array_push($omap[$action], $sequence); |
|
36 | + } |
|
37 | + |
|
38 | + print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>"; |
|
39 | + |
|
40 | + $cur_section = ""; |
|
41 | + foreach ($info as $section => $hotkeys) { |
|
42 | + |
|
43 | + if ($cur_section) print "<li> </li>"; |
|
44 | + print "<li><h3>" . $section . "</h3></li>"; |
|
45 | + $cur_section = $section; |
|
46 | + |
|
47 | + foreach ($hotkeys as $action => $description) { |
|
48 | + |
|
49 | + if (is_array($omap[$action])) { |
|
50 | + foreach ($omap[$action] as $sequence) { |
|
51 | + if (strpos($sequence, "|") !== false) { |
|
52 | + $sequence = substr($sequence, |
|
53 | + strpos($sequence, "|")+1, |
|
54 | + strlen($sequence)); |
|
55 | + } else { |
|
56 | + $keys = explode(" ", $sequence); |
|
57 | + |
|
58 | + for ($i = 0; $i < count($keys); $i++) { |
|
59 | + if (strlen($keys[$i]) > 1) { |
|
60 | + $tmp = ''; |
|
61 | + foreach (str_split($keys[$i]) as $c) { |
|
62 | + switch ($c) { |
|
63 | + case '*': |
|
64 | + $tmp .= __('Shift') . '+'; |
|
65 | + break; |
|
66 | + case '^': |
|
67 | + $tmp .= __('Ctrl') . '+'; |
|
68 | + break; |
|
69 | + default: |
|
70 | + $tmp .= $c; |
|
71 | + } |
|
72 | + } |
|
73 | + $keys[$i] = $tmp; |
|
74 | + } |
|
75 | + } |
|
76 | + $sequence = join(" ", $keys); |
|
77 | + } |
|
78 | + |
|
79 | + print "<li>"; |
|
80 | + print "<div class='hk'><code>$sequence</code></div>"; |
|
81 | + print "<div class='desc'>$description</div>"; |
|
82 | + print "</li>"; |
|
83 | + } |
|
84 | + } |
|
85 | + } |
|
86 | + } |
|
87 | + |
|
88 | + print "</ul>"; |
|
89 | + } |
|
90 | + |
|
91 | + print "<footer class='text-center'>"; |
|
92 | + print "<button dojoType='dijit.form.Button' |
|
93 | 93 | onclick=\"return dijit.byId('helpDlg').hide()\">".__('Close this window')."</button>"; |
94 | - print "</footer>"; |
|
94 | + print "</footer>"; |
|
95 | 95 | |
96 | - } |
|
96 | + } |
|
97 | 97 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | class Backend extends Handler { |
3 | 3 | public function loading() { |
4 | 4 | header("Content-type: text/html"); |
5 | - print __("Loading, please wait...") . " " . |
|
5 | + print __("Loading, please wait...")." ". |
|
6 | 6 | "<img src='images/indicator_tiny.gif'>"; |
7 | 7 | } |
8 | 8 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | foreach ($info as $section => $hotkeys) { |
42 | 42 | |
43 | 43 | if ($cur_section) print "<li> </li>"; |
44 | - print "<li><h3>" . $section . "</h3></li>"; |
|
44 | + print "<li><h3>".$section."</h3></li>"; |
|
45 | 45 | $cur_section = $section; |
46 | 46 | |
47 | 47 | foreach ($hotkeys as $action => $description) { |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | foreach ($omap[$action] as $sequence) { |
51 | 51 | if (strpos($sequence, "|") !== false) { |
52 | 52 | $sequence = substr($sequence, |
53 | - strpos($sequence, "|")+1, |
|
53 | + strpos($sequence, "|") + 1, |
|
54 | 54 | strlen($sequence)); |
55 | 55 | } else { |
56 | 56 | $keys = explode(" ", $sequence); |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | foreach (str_split($keys[$i]) as $c) { |
62 | 62 | switch ($c) { |
63 | 63 | case '*': |
64 | - $tmp .= __('Shift') . '+'; |
|
64 | + $tmp .= __('Shift').'+'; |
|
65 | 65 | break; |
66 | 66 | case '^': |
67 | - $tmp .= __('Ctrl') . '+'; |
|
67 | + $tmp .= __('Ctrl').'+'; |
|
68 | 68 | break; |
69 | 69 | default: |
70 | 70 | $tmp .= $c; |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | $line[$k] = htmlspecialchars($v); |
61 | 61 | } |
62 | 62 | |
63 | - print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>"; |
|
64 | - print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>"; |
|
65 | - print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>"; |
|
66 | - print "<td class='login'>" . $line["login"] . "</td>"; |
|
63 | + print "<td class='errno'>".Logger::$errornames[$line["errno"]]." (".$line["errno"].")</td>"; |
|
64 | + print "<td class='filename'>".$line["filename"].":".$line["lineno"]."</td>"; |
|
65 | + print "<td class='errstr'>".$line["errstr"]."<hr/>".nl2br($line["context"])."</td>"; |
|
66 | + print "<td class='login'>".$line["login"]."</td>"; |
|
67 | 67 | |
68 | - print "<td class='timestamp'>" . |
|
68 | + print "<td class='timestamp'>". |
|
69 | 69 | make_local_datetime( |
70 | - $line["created_at"], false) . "</td>"; |
|
70 | + $line["created_at"], false)."</td>"; |
|
71 | 71 | |
72 | 72 | print "</tr>"; |
73 | 73 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | ob_end_clean(); |
91 | 91 | |
92 | 92 | print "<div class='phpinfo'>"; |
93 | - print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info); |
|
93 | + print preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $info); |
|
94 | 94 | print "</div>"; |
95 | 95 | |
96 | 96 | print "</div>"; |
@@ -2,50 +2,50 @@ discard block |
||
2 | 2 | |
3 | 3 | class Pref_System extends Handler_Protected { |
4 | 4 | |
5 | - public function before($method) { |
|
6 | - if (parent::before($method)) { |
|
7 | - if ($_SESSION["access_level"] < 10) { |
|
8 | - print __("Your access level is insufficient to open this tab."); |
|
9 | - return false; |
|
10 | - } |
|
11 | - return true; |
|
12 | - } |
|
13 | - return false; |
|
14 | - } |
|
15 | - |
|
16 | - public function csrf_ignore($method) { |
|
17 | - $csrf_ignored = array("index"); |
|
18 | - |
|
19 | - return array_search($method, $csrf_ignored) !== false; |
|
20 | - } |
|
21 | - |
|
22 | - public function clearLog() { |
|
23 | - $this->pdo->query("DELETE FROM ttrss_error_log"); |
|
24 | - } |
|
25 | - |
|
26 | - public function index() { |
|
27 | - |
|
28 | - print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">"; |
|
29 | - print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
5 | + public function before($method) { |
|
6 | + if (parent::before($method)) { |
|
7 | + if ($_SESSION["access_level"] < 10) { |
|
8 | + print __("Your access level is insufficient to open this tab."); |
|
9 | + return false; |
|
10 | + } |
|
11 | + return true; |
|
12 | + } |
|
13 | + return false; |
|
14 | + } |
|
15 | + |
|
16 | + public function csrf_ignore($method) { |
|
17 | + $csrf_ignored = array("index"); |
|
18 | + |
|
19 | + return array_search($method, $csrf_ignored) !== false; |
|
20 | + } |
|
21 | + |
|
22 | + public function clearLog() { |
|
23 | + $this->pdo->query("DELETE FROM ttrss_error_log"); |
|
24 | + } |
|
25 | + |
|
26 | + public function index() { |
|
27 | + |
|
28 | + print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">"; |
|
29 | + print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
30 | 30 | title=\"<i class='material-icons'>report</i> ".__('Event Log')."\">"; |
31 | 31 | |
32 | - if (LOG_DESTINATION == "sql") { |
|
32 | + if (LOG_DESTINATION == "sql") { |
|
33 | 33 | |
34 | - $res = $this->pdo->query("SELECT errno, errstr, filename, lineno, |
|
34 | + $res = $this->pdo->query("SELECT errno, errstr, filename, lineno, |
|
35 | 35 | created_at, login, context FROM ttrss_error_log |
36 | 36 | LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id) |
37 | 37 | ORDER BY ttrss_error_log.id DESC |
38 | 38 | LIMIT 100"); |
39 | 39 | |
40 | - print "<button dojoType=\"dijit.form.Button\" |
|
40 | + print "<button dojoType=\"dijit.form.Button\" |
|
41 | 41 | onclick=\"Helpers.updateEventLog()\">".__('Refresh')."</button> "; |
42 | 42 | |
43 | - print " <button dojoType=\"dijit.form.Button\" |
|
43 | + print " <button dojoType=\"dijit.form.Button\" |
|
44 | 44 | class=\"alt-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> "; |
45 | 45 | |
46 | - print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">"; |
|
46 | + print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">"; |
|
47 | 47 | |
48 | - print "<tr class=\"title\"> |
|
48 | + print "<tr class=\"title\"> |
|
49 | 49 | <td width='5%'>".__("Error")."</td> |
50 | 50 | <td>".__("Filename")."</td> |
51 | 51 | <td>".__("Message")."</td> |
@@ -53,52 +53,52 @@ discard block |
||
53 | 53 | <td width='5%'>".__("Date")."</td> |
54 | 54 | </tr>"; |
55 | 55 | |
56 | - while ($line = $res->fetch()) { |
|
57 | - print "<tr>"; |
|
56 | + while ($line = $res->fetch()) { |
|
57 | + print "<tr>"; |
|
58 | 58 | |
59 | - foreach ($line as $k => $v) { |
|
60 | - $line[$k] = htmlspecialchars($v); |
|
61 | - } |
|
59 | + foreach ($line as $k => $v) { |
|
60 | + $line[$k] = htmlspecialchars($v); |
|
61 | + } |
|
62 | 62 | |
63 | - print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>"; |
|
64 | - print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>"; |
|
65 | - print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>"; |
|
66 | - print "<td class='login'>" . $line["login"] . "</td>"; |
|
63 | + print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>"; |
|
64 | + print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>"; |
|
65 | + print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>"; |
|
66 | + print "<td class='login'>" . $line["login"] . "</td>"; |
|
67 | 67 | |
68 | - print "<td class='timestamp'>" . |
|
69 | - make_local_datetime( |
|
70 | - $line["created_at"], false) . "</td>"; |
|
68 | + print "<td class='timestamp'>" . |
|
69 | + make_local_datetime( |
|
70 | + $line["created_at"], false) . "</td>"; |
|
71 | 71 | |
72 | - print "</tr>"; |
|
73 | - } |
|
72 | + print "</tr>"; |
|
73 | + } |
|
74 | 74 | |
75 | - print "</table>"; |
|
76 | - } else { |
|
75 | + print "</table>"; |
|
76 | + } else { |
|
77 | 77 | |
78 | - print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging."); |
|
78 | + print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging."); |
|
79 | 79 | |
80 | - } |
|
80 | + } |
|
81 | 81 | |
82 | - print "</div>"; |
|
82 | + print "</div>"; |
|
83 | 83 | |
84 | - print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
84 | + print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
85 | 85 | title=\"<i class='material-icons'>info</i> ".__('PHP Information')."\">"; |
86 | 86 | |
87 | - ob_start(); |
|
88 | - phpinfo(); |
|
89 | - $info = ob_get_contents(); |
|
90 | - ob_end_clean(); |
|
87 | + ob_start(); |
|
88 | + phpinfo(); |
|
89 | + $info = ob_get_contents(); |
|
90 | + ob_end_clean(); |
|
91 | 91 | |
92 | - print "<div class='phpinfo'>"; |
|
93 | - print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info); |
|
94 | - print "</div>"; |
|
92 | + print "<div class='phpinfo'>"; |
|
93 | + print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info); |
|
94 | + print "</div>"; |
|
95 | 95 | |
96 | - print "</div>"; |
|
96 | + print "</div>"; |
|
97 | 97 | |
98 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
99 | - "hook_prefs_tab", "prefSystem"); |
|
98 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
99 | + "hook_prefs_tab", "prefSystem"); |
|
100 | 100 | |
101 | - print "</div>"; #container |
|
102 | - } |
|
101 | + print "</div>"; #container |
|
102 | + } |
|
103 | 103 | |
104 | 104 | } |
@@ -170,22 +170,22 @@ |
||
170 | 170 | $value = $_POST[$pref_name]; |
171 | 171 | |
172 | 172 | switch ($pref_name) { |
173 | - case 'DIGEST_PREFERRED_TIME': |
|
174 | - if (get_pref('DIGEST_PREFERRED_TIME') != $value) { |
|
173 | + case 'DIGEST_PREFERRED_TIME': |
|
174 | + if (get_pref('DIGEST_PREFERRED_TIME') != $value) { |
|
175 | 175 | |
176 | - $sth = $this->pdo->prepare("UPDATE ttrss_users SET |
|
176 | + $sth = $this->pdo->prepare("UPDATE ttrss_users SET |
|
177 | 177 | last_digest_sent = NULL WHERE id = ?"); |
178 | - $sth->execute([$_SESSION['uid']]); |
|
178 | + $sth->execute([$_SESSION['uid']]); |
|
179 | 179 | |
180 | - } |
|
181 | - break; |
|
182 | - case 'USER_LANGUAGE': |
|
183 | - if (!$need_reload) $need_reload = $_SESSION["language"] != $value; |
|
184 | - break; |
|
185 | - |
|
186 | - case 'USER_CSS_THEME': |
|
187 | - if (!$need_reload) $need_reload = get_pref($pref_name) != $value; |
|
188 | - break; |
|
180 | + } |
|
181 | + break; |
|
182 | + case 'USER_LANGUAGE': |
|
183 | + if (!$need_reload) $need_reload = $_SESSION["language"] != $value; |
|
184 | + break; |
|
185 | + |
|
186 | + case 'USER_CSS_THEME': |
|
187 | + if (!$need_reload) $need_reload = get_pref($pref_name) != $value; |
|
188 | + break; |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | set_pref($pref_name, $value); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | "ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")), |
83 | 83 | "ENABLE_FEED_CATS" => array(__("Enable categories")), |
84 | 84 | "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""), |
85 | - "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"), |
|
85 | + "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>".__("hours")."</strong>"), |
|
86 | 86 | "HIDE_READ_FEEDS" => array(__("Hide read feeds")), |
87 | 87 | "HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")), |
88 | 88 | "LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")), |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | |
404 | 404 | if ($_SESSION["auth_module"] == "auth_internal") { |
405 | 405 | |
406 | - print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">"; |
|
406 | + print "<div dojoType='dijit.layout.ContentPane' title=\"".__('App passwords')."\">"; |
|
407 | 407 | |
408 | 408 | print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP."); |
409 | 409 | |
@@ -415,11 +415,11 @@ discard block |
||
415 | 415 | |
416 | 416 | print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button' |
417 | 417 | onclick=\"Helpers.AppPasswords.generate()\">" . |
418 | - __('Generate new password') . "</button> "; |
|
418 | + __('Generate new password')."</button> "; |
|
419 | 419 | |
420 | 420 | print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' |
421 | 421 | onclick=\"Helpers.AppPasswords.removeSelected()\">" . |
422 | - __('Remove selected passwords') . "</button>"; |
|
422 | + __('Remove selected passwords')."</button>"; |
|
423 | 423 | |
424 | 424 | print "</div>"; # content pane |
425 | 425 | } |
@@ -474,13 +474,13 @@ discard block |
||
474 | 474 | print_notice("You will need to generate app passwords for the API clients if you enable OTP."); |
475 | 475 | |
476 | 476 | if (function_exists("imagecreatefromstring")) { |
477 | - print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>"; |
|
477 | + print "<h3>".__("Scan the following code by the Authenticator application or copy the key manually")."</h3>"; |
|
478 | 478 | |
479 | 479 | $csrf_token = $_SESSION["csrf_token"]; |
480 | 480 | print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>"; |
481 | 481 | } else { |
482 | 482 | print_error("PHP GD functions are required to generate QR codes."); |
483 | - print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>"; |
|
483 | + print "<h3>".__("Use the following OTP key with a compatible Authenticator application")."</h3>"; |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | print "<form dojoType='dijit.form.Form' id='changeOtpForm'>"; |
@@ -647,7 +647,7 @@ discard block |
||
647 | 647 | print "<fieldset class='prefs'>"; |
648 | 648 | |
649 | 649 | print "<label for='CB_$pref_name'>"; |
650 | - print $item['short_desc'] . ":"; |
|
650 | + print $item['short_desc'].":"; |
|
651 | 651 | print "</label>"; |
652 | 652 | |
653 | 653 | $value = $item['value']; |
@@ -684,7 +684,7 @@ discard block |
||
684 | 684 | print "</select>"; |
685 | 685 | |
686 | 686 | print " <button dojoType=\"dijit.form.Button\" class='alt-info' |
687 | - onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>"; |
|
687 | + onclick=\"Helpers.customizeCSS()\">" . __('Customize')."</button>"; |
|
688 | 688 | |
689 | 689 | print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'> |
690 | 690 | <i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>"; |
@@ -747,12 +747,12 @@ discard block |
||
747 | 747 | $has_serial = ($cert_serial) ? "false" : "true"; |
748 | 748 | |
749 | 749 | print "<button dojoType='dijit.form.Button' disabled='$has_serial' |
750 | - onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" . |
|
751 | - __('Register') . "</button>"; |
|
750 | + onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">". |
|
751 | + __('Register')."</button>"; |
|
752 | 752 | |
753 | 753 | print "<button dojoType='dijit.form.Button' class='alt-danger' |
754 | 754 | onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" . |
755 | - __('Clear') . "</button>"; |
|
755 | + __('Clear')."</button>"; |
|
756 | 756 | |
757 | 757 | print "<button dojoType='dijit.form.Button' class='alt-info' |
758 | 758 | onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'> |
@@ -763,7 +763,7 @@ discard block |
||
763 | 763 | id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\" |
764 | 764 | name=\"$pref_name\" value=\"$value\">"; |
765 | 765 | |
766 | - $item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i")); |
|
766 | + $item['help_text'] .= ". ".T_sprintf("Current server time: %s", date("H:i")); |
|
767 | 767 | } else { |
768 | 768 | $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; |
769 | 769 | |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly."); |
850 | 850 | } |
851 | 851 | |
852 | - $feed_handler_whitelist = [ "Af_Comics" ]; |
|
852 | + $feed_handler_whitelist = ["Af_Comics"]; |
|
853 | 853 | |
854 | 854 | $feed_handlers = array_merge( |
855 | 855 | PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED), |
@@ -861,9 +861,9 @@ discard block |
||
861 | 861 | |
862 | 862 | if (count($feed_handlers) > 0) { |
863 | 863 | print_error( |
864 | - T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" , |
|
864 | + T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>", |
|
865 | 865 | implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers)) |
866 | - ) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)" |
|
866 | + )." (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)" |
|
867 | 867 | ); |
868 | 868 | } |
869 | 869 | |
@@ -892,7 +892,7 @@ discard block |
||
892 | 892 | <label class='checkbox description text-muted' id='PLABEL-$name'> |
893 | 893 | <input disabled='1' |
894 | 894 | dojoType='dijit.form.CheckBox' $checked type='checkbox'> |
895 | - ".htmlspecialchars($about[1]). "</label>"; |
|
895 | + ".htmlspecialchars($about[1])."</label>"; |
|
896 | 896 | |
897 | 897 | if (@$about[4]) { |
898 | 898 | print "<button dojoType='dijit.form.Button' class='alt-info' |
@@ -1154,7 +1154,7 @@ discard block |
||
1154 | 1154 | print "<div dojoType='fox.Toolbar'>"; |
1155 | 1155 | |
1156 | 1156 | print "<div dojoType='fox.form.DropDownButton'>". |
1157 | - "<span>" . __('Select')."</span>"; |
|
1157 | + "<span>".__('Select')."</span>"; |
|
1158 | 1158 | print "<div dojoType='dijit.Menu' style='display: none'>"; |
1159 | 1159 | print "<div onclick=\"Tables.select('pref-profiles-list', true)\" |
1160 | 1160 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
@@ -1192,7 +1192,7 @@ discard block |
||
1192 | 1192 | $is_active = ""; |
1193 | 1193 | } |
1194 | 1194 | |
1195 | - print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>"; |
|
1195 | + print "<td width='100%'><span>".__("Default profile")." $is_active</span></td>"; |
|
1196 | 1196 | |
1197 | 1197 | print "</tr>"; |
1198 | 1198 | |
@@ -1214,7 +1214,7 @@ discard block |
||
1214 | 1214 | |
1215 | 1215 | print "<td><span dojoType='dijit.InlineEditBox' |
1216 | 1216 | width='300px' autoSave='false' |
1217 | - profile-id='$profile_id'>" . $edit_title . |
|
1217 | + profile-id='$profile_id'>".$edit_title. |
|
1218 | 1218 | "<script type='dojo/method' event='onChange' args='item'> |
1219 | 1219 | var elem = this; |
1220 | 1220 | dojo.xhrPost({ |
@@ -1263,13 +1263,13 @@ discard block |
||
1263 | 1263 | |
1264 | 1264 | private function appPasswordList() { |
1265 | 1265 | print "<div dojoType='fox.Toolbar'>"; |
1266 | - print "<div dojoType='fox.form.DropDownButton'>" . |
|
1267 | - "<span>" . __('Select') . "</span>"; |
|
1266 | + print "<div dojoType='fox.form.DropDownButton'>". |
|
1267 | + "<span>".__('Select')."</span>"; |
|
1268 | 1268 | print "<div dojoType='dijit.Menu' style='display: none'>"; |
1269 | 1269 | print "<div onclick=\"Tables.select('app-password-list', true)\" |
1270 | - dojoType=\"dijit.MenuItem\">" . __('All') . "</div>"; |
|
1270 | + dojoType=\"dijit.MenuItem\">" . __('All')."</div>"; |
|
1271 | 1271 | print "<div onclick=\"Tables.select('app-password-list', false)\" |
1272 | - dojoType=\"dijit.MenuItem\">" . __('None') . "</div>"; |
|
1272 | + dojoType=\"dijit.MenuItem\">" . __('None')."</div>"; |
|
1273 | 1273 | print "</div></div>"; |
1274 | 1274 | print "</div>"; #toolbar |
1275 | 1275 | |
@@ -1294,7 +1294,7 @@ discard block |
||
1294 | 1294 | |
1295 | 1295 | print "<td align='center'> |
1296 | 1296 | <input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
1297 | - print "<td>" . htmlspecialchars($row["title"]) . "</td>"; |
|
1297 | + print "<td>".htmlspecialchars($row["title"])."</td>"; |
|
1298 | 1298 | |
1299 | 1299 | print "<td align='right' class='text-muted'>"; |
1300 | 1300 | print make_local_datetime($row['created'], false); |
@@ -1314,7 +1314,7 @@ discard block |
||
1314 | 1314 | private function encryptAppPassword($password) { |
1315 | 1315 | $salt = substr(bin2hex(get_random_bytes(24)), 0, 24); |
1316 | 1316 | |
1317 | - return "SSHA-512:".hash('sha512', $salt . $password). ":$salt"; |
|
1317 | + return "SSHA-512:".hash('sha512', $salt.$password).":$salt"; |
|
1318 | 1318 | } |
1319 | 1319 | |
1320 | 1320 | public function deleteAppPassword() { |
@@ -160,7 +160,9 @@ discard block |
||
160 | 160 | $boolean_prefs = explode(",", clean($_POST["boolean_prefs"])); |
161 | 161 | |
162 | 162 | foreach ($boolean_prefs as $pref) { |
163 | - if (!isset($_POST[$pref])) $_POST[$pref] = 'false'; |
|
163 | + if (!isset($_POST[$pref])) { |
|
164 | + $_POST[$pref] = 'false'; |
|
165 | + } |
|
164 | 166 | } |
165 | 167 | |
166 | 168 | $need_reload = false; |
@@ -180,11 +182,15 @@ discard block |
||
180 | 182 | } |
181 | 183 | break; |
182 | 184 | case 'USER_LANGUAGE': |
183 | - if (!$need_reload) $need_reload = $_SESSION["language"] != $value; |
|
185 | + if (!$need_reload) { |
|
186 | + $need_reload = $_SESSION["language"] != $value; |
|
187 | + } |
|
184 | 188 | break; |
185 | 189 | |
186 | 190 | case 'USER_CSS_THEME': |
187 | - if (!$need_reload) $need_reload = get_pref($pref_name) != $value; |
|
191 | + if (!$need_reload) { |
|
192 | + $need_reload = get_pref($pref_name) != $value; |
|
193 | + } |
|
188 | 194 | break; |
189 | 195 | } |
190 | 196 | |
@@ -616,8 +622,9 @@ discard block |
||
616 | 622 | $pref_name = $line["pref_name"]; |
617 | 623 | $short_desc = $this->getShortDesc($pref_name); |
618 | 624 | |
619 | - if (!$short_desc) |
|
620 | - continue; |
|
625 | + if (!$short_desc) { |
|
626 | + continue; |
|
627 | + } |
|
621 | 628 | |
622 | 629 | $prefs_available[$pref_name] = [ |
623 | 630 | 'type_name' => $line["type_name"], |
@@ -669,7 +676,9 @@ discard block |
||
669 | 676 | $themes = array_filter($themes, "theme_exists"); |
670 | 677 | asort($themes); |
671 | 678 | |
672 | - if (!theme_exists($value)) $value = "default.php"; |
|
679 | + if (!theme_exists($value)) { |
|
680 | + $value = "default.php"; |
|
681 | + } |
|
673 | 682 | |
674 | 683 | print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>"; |
675 | 684 | |
@@ -728,14 +737,15 @@ discard block |
||
728 | 737 | $disabled = ""; |
729 | 738 | } |
730 | 739 | |
731 | - if ($type_name == 'integer') |
|
732 | - print "<input dojoType=\"dijit.form.NumberSpinner\" |
|
740 | + if ($type_name == 'integer') { |
|
741 | + print "<input dojoType=\"dijit.form.NumberSpinner\" |
|
733 | 742 | required='1' $disabled |
734 | 743 | name=\"$pref_name\" value=\"$value\">"; |
735 | - else |
|
736 | - print "<input dojoType=\"dijit.form.TextBox\" |
|
744 | + } else { |
|
745 | + print "<input dojoType=\"dijit.form.TextBox\" |
|
737 | 746 | required='1' $regexp $disabled |
738 | 747 | name=\"$pref_name\" value=\"$value\">"; |
748 | + } |
|
739 | 749 | |
740 | 750 | } else if ($pref_name == "SSL_CERT_SERIAL") { |
741 | 751 | |
@@ -770,8 +780,9 @@ discard block |
||
770 | 780 | print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">"; |
771 | 781 | } |
772 | 782 | |
773 | - if ($item['help_text']) |
|
774 | - print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; |
|
783 | + if ($item['help_text']) { |
|
784 | + print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; |
|
785 | + } |
|
775 | 786 | |
776 | 787 | print "</fieldset>"; |
777 | 788 | } |
@@ -1108,10 +1119,11 @@ discard block |
||
1108 | 1119 | } |
1109 | 1120 | |
1110 | 1121 | public function setplugins() { |
1111 | - if (is_array(clean($_REQUEST["plugins"]))) |
|
1112 | - $plugins = join(",", clean($_REQUEST["plugins"])); |
|
1113 | - else |
|
1114 | - $plugins = ""; |
|
1122 | + if (is_array(clean($_REQUEST["plugins"]))) { |
|
1123 | + $plugins = join(",", clean($_REQUEST["plugins"])); |
|
1124 | + } else { |
|
1125 | + $plugins = ""; |
|
1126 | + } |
|
1115 | 1127 | |
1116 | 1128 | set_pref("_ENABLED_PLUGINS", $plugins); |
1117 | 1129 | } |
@@ -2,278 +2,278 @@ discard block |
||
2 | 2 | |
3 | 3 | class Pref_Prefs extends Handler_Protected { |
4 | 4 | |
5 | - private $pref_help = []; |
|
6 | - private $pref_item_map = []; |
|
7 | - private $pref_blacklist = []; |
|
8 | - private $profile_blacklist = []; |
|
9 | - |
|
10 | - public function csrf_ignore($method) { |
|
11 | - $csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles"); |
|
12 | - |
|
13 | - return array_search($method, $csrf_ignored) !== false; |
|
14 | - } |
|
15 | - |
|
16 | - public function __construct($args) { |
|
17 | - parent::__construct($args); |
|
18 | - |
|
19 | - $this->pref_item_map = [ |
|
20 | - __('General') => [ |
|
21 | - 'USER_LANGUAGE', |
|
22 | - 'USER_TIMEZONE', |
|
23 | - 'BLOCK_SEPARATOR', |
|
24 | - 'USER_CSS_THEME', |
|
25 | - 'BLOCK_SEPARATOR', |
|
26 | - 'ENABLE_API_ACCESS', |
|
27 | - ], |
|
28 | - __('Feeds') => [ |
|
29 | - 'DEFAULT_UPDATE_INTERVAL', |
|
30 | - 'FRESH_ARTICLE_MAX_AGE', |
|
31 | - 'DEFAULT_SEARCH_LANGUAGE', |
|
32 | - 'BLOCK_SEPARATOR', |
|
33 | - 'ENABLE_FEED_CATS', |
|
34 | - 'BLOCK_SEPARATOR', |
|
35 | - 'CONFIRM_FEED_CATCHUP', |
|
36 | - 'ON_CATCHUP_SHOW_NEXT_FEED', |
|
37 | - 'BLOCK_SEPARATOR', |
|
38 | - 'HIDE_READ_FEEDS', |
|
39 | - 'HIDE_READ_SHOWS_SPECIAL', |
|
40 | - ], |
|
41 | - __('Articles') => [ |
|
42 | - 'PURGE_OLD_DAYS', |
|
43 | - 'PURGE_UNREAD_ARTICLES', |
|
44 | - 'BLOCK_SEPARATOR', |
|
45 | - 'COMBINED_DISPLAY_MODE', |
|
46 | - 'CDM_EXPANDED', |
|
47 | - 'BLOCK_SEPARATOR', |
|
48 | - 'CDM_AUTO_CATCHUP', |
|
49 | - 'VFEED_GROUP_BY_FEED', |
|
50 | - 'BLOCK_SEPARATOR', |
|
51 | - 'SHOW_CONTENT_PREVIEW', |
|
52 | - 'STRIP_IMAGES', |
|
53 | - ], |
|
54 | - __('Digest') => [ |
|
55 | - 'DIGEST_ENABLE', |
|
56 | - 'DIGEST_CATCHUP', |
|
57 | - 'DIGEST_PREFERRED_TIME', |
|
58 | - ], |
|
59 | - __('Advanced') => [ |
|
60 | - 'BLACKLISTED_TAGS', |
|
61 | - 'BLOCK_SEPARATOR', |
|
62 | - 'LONG_DATE_FORMAT', |
|
63 | - 'SHORT_DATE_FORMAT', |
|
64 | - 'BLOCK_SEPARATOR', |
|
65 | - 'SSL_CERT_SERIAL', |
|
66 | - ] |
|
67 | - ]; |
|
68 | - |
|
69 | - $this->pref_help = [ |
|
70 | - "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""), |
|
71 | - "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("Never apply these tags automatically (comma-separated list).")), |
|
72 | - "DEFAULT_SEARCH_LANGUAGE" => array(__("Default language"), __("Used for full-text search")), |
|
73 | - "CDM_AUTO_CATCHUP" => array(__("Mark read on scroll"), __("Mark articles as read as you scroll past them")), |
|
74 | - "CDM_EXPANDED" => array(__("Always expand articles")), |
|
75 | - "COMBINED_DISPLAY_MODE" => array(__("Combined mode"), __("Show flat list of articles instead of separate panels")), |
|
76 | - "CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feeds as read")), |
|
77 | - "DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once")), |
|
78 | - "DEFAULT_UPDATE_INTERVAL" => array(__("Default update interval")), |
|
79 | - "DIGEST_CATCHUP" => array(__("Mark sent articles as read")), |
|
80 | - "DIGEST_ENABLE" => array(__("Enable digest"), __("Send daily digest of new (and unread) headlines to your e-mail address")), |
|
81 | - "DIGEST_PREFERRED_TIME" => array(__("Try to send around this time"), __("Time in UTC")), |
|
82 | - "ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")), |
|
83 | - "ENABLE_FEED_CATS" => array(__("Enable categories")), |
|
84 | - "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""), |
|
85 | - "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"), |
|
86 | - "HIDE_READ_FEEDS" => array(__("Hide read feeds")), |
|
87 | - "HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")), |
|
88 | - "LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")), |
|
89 | - "ON_CATCHUP_SHOW_NEXT_FEED" => array(__("Automatically show next feed"), __("After marking one as read")), |
|
90 | - "PURGE_OLD_DAYS" => array(__("Purge articles older than"), __("<strong>days</strong> (0 disables)")), |
|
91 | - "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles")), |
|
92 | - "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)")), |
|
93 | - "SHORT_DATE_FORMAT" => array(__("Short date format")), |
|
94 | - "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines")), |
|
95 | - "SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")), |
|
96 | - "SSL_CERT_SERIAL" => array(__("SSL client certificate")), |
|
97 | - "STRIP_IMAGES" => array(__("Do not embed media")), |
|
98 | - "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")), |
|
99 | - "USER_STYLESHEET" => array(__("Customize stylesheet")), |
|
100 | - "USER_TIMEZONE" => array(__("Time zone")), |
|
101 | - "VFEED_GROUP_BY_FEED" => array(__("Group by feed"), __("Group multiple-feed output by originating feed")), |
|
102 | - "USER_LANGUAGE" => array(__("Language")), |
|
103 | - "USER_CSS_THEME" => array(__("Theme")) |
|
104 | - ]; |
|
105 | - |
|
106 | - $this->pref_blacklist = ["ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", |
|
107 | - "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT", |
|
108 | - "FEEDS_SORT_BY_UNREAD", "USER_STYLESHEET"]; |
|
109 | - |
|
110 | - /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */ |
|
111 | - |
|
112 | - $this->profile_blacklist = ["ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", |
|
113 | - "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", |
|
114 | - "BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE", |
|
115 | - "DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE", |
|
116 | - "SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"]; |
|
117 | - } |
|
118 | - |
|
119 | - public function changepassword() { |
|
120 | - |
|
121 | - if (defined('_TTRSS_DEMO_INSTANCE')) { |
|
122 | - print "ERROR: ".format_error("Disabled in demo version."); |
|
123 | - return; |
|
124 | - } |
|
125 | - |
|
126 | - $old_pw = clean($_POST["old_password"]); |
|
127 | - $new_pw = clean($_POST["new_password"]); |
|
128 | - $con_pw = clean($_POST["confirm_password"]); |
|
129 | - |
|
130 | - if ($old_pw == $new_pw) { |
|
131 | - print "ERROR: ".format_error("New password must be different from the old one."); |
|
132 | - return; |
|
133 | - } |
|
134 | - |
|
135 | - if ($old_pw == "") { |
|
136 | - print "ERROR: ".format_error("Old password cannot be blank."); |
|
137 | - return; |
|
138 | - } |
|
139 | - |
|
140 | - if ($new_pw == "") { |
|
141 | - print "ERROR: ".format_error("New password cannot be blank."); |
|
142 | - return; |
|
143 | - } |
|
144 | - |
|
145 | - if ($new_pw != $con_pw) { |
|
146 | - print "ERROR: ".format_error("Entered passwords do not match."); |
|
147 | - return; |
|
148 | - } |
|
149 | - |
|
150 | - $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
151 | - |
|
152 | - if (method_exists($authenticator, "change_password")) { |
|
153 | - print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw)); |
|
154 | - } else { |
|
155 | - print "ERROR: ".format_error("Function not supported by authentication module."); |
|
156 | - } |
|
157 | - } |
|
158 | - |
|
159 | - public function saveconfig() { |
|
160 | - $boolean_prefs = explode(",", clean($_POST["boolean_prefs"])); |
|
161 | - |
|
162 | - foreach ($boolean_prefs as $pref) { |
|
163 | - if (!isset($_POST[$pref])) $_POST[$pref] = 'false'; |
|
164 | - } |
|
165 | - |
|
166 | - $need_reload = false; |
|
167 | - |
|
168 | - foreach (array_keys($_POST) as $pref_name) { |
|
169 | - |
|
170 | - $value = $_POST[$pref_name]; |
|
171 | - |
|
172 | - switch ($pref_name) { |
|
173 | - case 'DIGEST_PREFERRED_TIME': |
|
174 | - if (get_pref('DIGEST_PREFERRED_TIME') != $value) { |
|
175 | - |
|
176 | - $sth = $this->pdo->prepare("UPDATE ttrss_users SET |
|
5 | + private $pref_help = []; |
|
6 | + private $pref_item_map = []; |
|
7 | + private $pref_blacklist = []; |
|
8 | + private $profile_blacklist = []; |
|
9 | + |
|
10 | + public function csrf_ignore($method) { |
|
11 | + $csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles"); |
|
12 | + |
|
13 | + return array_search($method, $csrf_ignored) !== false; |
|
14 | + } |
|
15 | + |
|
16 | + public function __construct($args) { |
|
17 | + parent::__construct($args); |
|
18 | + |
|
19 | + $this->pref_item_map = [ |
|
20 | + __('General') => [ |
|
21 | + 'USER_LANGUAGE', |
|
22 | + 'USER_TIMEZONE', |
|
23 | + 'BLOCK_SEPARATOR', |
|
24 | + 'USER_CSS_THEME', |
|
25 | + 'BLOCK_SEPARATOR', |
|
26 | + 'ENABLE_API_ACCESS', |
|
27 | + ], |
|
28 | + __('Feeds') => [ |
|
29 | + 'DEFAULT_UPDATE_INTERVAL', |
|
30 | + 'FRESH_ARTICLE_MAX_AGE', |
|
31 | + 'DEFAULT_SEARCH_LANGUAGE', |
|
32 | + 'BLOCK_SEPARATOR', |
|
33 | + 'ENABLE_FEED_CATS', |
|
34 | + 'BLOCK_SEPARATOR', |
|
35 | + 'CONFIRM_FEED_CATCHUP', |
|
36 | + 'ON_CATCHUP_SHOW_NEXT_FEED', |
|
37 | + 'BLOCK_SEPARATOR', |
|
38 | + 'HIDE_READ_FEEDS', |
|
39 | + 'HIDE_READ_SHOWS_SPECIAL', |
|
40 | + ], |
|
41 | + __('Articles') => [ |
|
42 | + 'PURGE_OLD_DAYS', |
|
43 | + 'PURGE_UNREAD_ARTICLES', |
|
44 | + 'BLOCK_SEPARATOR', |
|
45 | + 'COMBINED_DISPLAY_MODE', |
|
46 | + 'CDM_EXPANDED', |
|
47 | + 'BLOCK_SEPARATOR', |
|
48 | + 'CDM_AUTO_CATCHUP', |
|
49 | + 'VFEED_GROUP_BY_FEED', |
|
50 | + 'BLOCK_SEPARATOR', |
|
51 | + 'SHOW_CONTENT_PREVIEW', |
|
52 | + 'STRIP_IMAGES', |
|
53 | + ], |
|
54 | + __('Digest') => [ |
|
55 | + 'DIGEST_ENABLE', |
|
56 | + 'DIGEST_CATCHUP', |
|
57 | + 'DIGEST_PREFERRED_TIME', |
|
58 | + ], |
|
59 | + __('Advanced') => [ |
|
60 | + 'BLACKLISTED_TAGS', |
|
61 | + 'BLOCK_SEPARATOR', |
|
62 | + 'LONG_DATE_FORMAT', |
|
63 | + 'SHORT_DATE_FORMAT', |
|
64 | + 'BLOCK_SEPARATOR', |
|
65 | + 'SSL_CERT_SERIAL', |
|
66 | + ] |
|
67 | + ]; |
|
68 | + |
|
69 | + $this->pref_help = [ |
|
70 | + "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""), |
|
71 | + "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("Never apply these tags automatically (comma-separated list).")), |
|
72 | + "DEFAULT_SEARCH_LANGUAGE" => array(__("Default language"), __("Used for full-text search")), |
|
73 | + "CDM_AUTO_CATCHUP" => array(__("Mark read on scroll"), __("Mark articles as read as you scroll past them")), |
|
74 | + "CDM_EXPANDED" => array(__("Always expand articles")), |
|
75 | + "COMBINED_DISPLAY_MODE" => array(__("Combined mode"), __("Show flat list of articles instead of separate panels")), |
|
76 | + "CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feeds as read")), |
|
77 | + "DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once")), |
|
78 | + "DEFAULT_UPDATE_INTERVAL" => array(__("Default update interval")), |
|
79 | + "DIGEST_CATCHUP" => array(__("Mark sent articles as read")), |
|
80 | + "DIGEST_ENABLE" => array(__("Enable digest"), __("Send daily digest of new (and unread) headlines to your e-mail address")), |
|
81 | + "DIGEST_PREFERRED_TIME" => array(__("Try to send around this time"), __("Time in UTC")), |
|
82 | + "ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")), |
|
83 | + "ENABLE_FEED_CATS" => array(__("Enable categories")), |
|
84 | + "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""), |
|
85 | + "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"), |
|
86 | + "HIDE_READ_FEEDS" => array(__("Hide read feeds")), |
|
87 | + "HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")), |
|
88 | + "LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")), |
|
89 | + "ON_CATCHUP_SHOW_NEXT_FEED" => array(__("Automatically show next feed"), __("After marking one as read")), |
|
90 | + "PURGE_OLD_DAYS" => array(__("Purge articles older than"), __("<strong>days</strong> (0 disables)")), |
|
91 | + "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles")), |
|
92 | + "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)")), |
|
93 | + "SHORT_DATE_FORMAT" => array(__("Short date format")), |
|
94 | + "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines")), |
|
95 | + "SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")), |
|
96 | + "SSL_CERT_SERIAL" => array(__("SSL client certificate")), |
|
97 | + "STRIP_IMAGES" => array(__("Do not embed media")), |
|
98 | + "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")), |
|
99 | + "USER_STYLESHEET" => array(__("Customize stylesheet")), |
|
100 | + "USER_TIMEZONE" => array(__("Time zone")), |
|
101 | + "VFEED_GROUP_BY_FEED" => array(__("Group by feed"), __("Group multiple-feed output by originating feed")), |
|
102 | + "USER_LANGUAGE" => array(__("Language")), |
|
103 | + "USER_CSS_THEME" => array(__("Theme")) |
|
104 | + ]; |
|
105 | + |
|
106 | + $this->pref_blacklist = ["ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", |
|
107 | + "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT", |
|
108 | + "FEEDS_SORT_BY_UNREAD", "USER_STYLESHEET"]; |
|
109 | + |
|
110 | + /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */ |
|
111 | + |
|
112 | + $this->profile_blacklist = ["ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", |
|
113 | + "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", |
|
114 | + "BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE", |
|
115 | + "DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE", |
|
116 | + "SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"]; |
|
117 | + } |
|
118 | + |
|
119 | + public function changepassword() { |
|
120 | + |
|
121 | + if (defined('_TTRSS_DEMO_INSTANCE')) { |
|
122 | + print "ERROR: ".format_error("Disabled in demo version."); |
|
123 | + return; |
|
124 | + } |
|
125 | + |
|
126 | + $old_pw = clean($_POST["old_password"]); |
|
127 | + $new_pw = clean($_POST["new_password"]); |
|
128 | + $con_pw = clean($_POST["confirm_password"]); |
|
129 | + |
|
130 | + if ($old_pw == $new_pw) { |
|
131 | + print "ERROR: ".format_error("New password must be different from the old one."); |
|
132 | + return; |
|
133 | + } |
|
134 | + |
|
135 | + if ($old_pw == "") { |
|
136 | + print "ERROR: ".format_error("Old password cannot be blank."); |
|
137 | + return; |
|
138 | + } |
|
139 | + |
|
140 | + if ($new_pw == "") { |
|
141 | + print "ERROR: ".format_error("New password cannot be blank."); |
|
142 | + return; |
|
143 | + } |
|
144 | + |
|
145 | + if ($new_pw != $con_pw) { |
|
146 | + print "ERROR: ".format_error("Entered passwords do not match."); |
|
147 | + return; |
|
148 | + } |
|
149 | + |
|
150 | + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
151 | + |
|
152 | + if (method_exists($authenticator, "change_password")) { |
|
153 | + print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw)); |
|
154 | + } else { |
|
155 | + print "ERROR: ".format_error("Function not supported by authentication module."); |
|
156 | + } |
|
157 | + } |
|
158 | + |
|
159 | + public function saveconfig() { |
|
160 | + $boolean_prefs = explode(",", clean($_POST["boolean_prefs"])); |
|
161 | + |
|
162 | + foreach ($boolean_prefs as $pref) { |
|
163 | + if (!isset($_POST[$pref])) $_POST[$pref] = 'false'; |
|
164 | + } |
|
165 | + |
|
166 | + $need_reload = false; |
|
167 | + |
|
168 | + foreach (array_keys($_POST) as $pref_name) { |
|
169 | + |
|
170 | + $value = $_POST[$pref_name]; |
|
171 | + |
|
172 | + switch ($pref_name) { |
|
173 | + case 'DIGEST_PREFERRED_TIME': |
|
174 | + if (get_pref('DIGEST_PREFERRED_TIME') != $value) { |
|
175 | + |
|
176 | + $sth = $this->pdo->prepare("UPDATE ttrss_users SET |
|
177 | 177 | last_digest_sent = NULL WHERE id = ?"); |
178 | - $sth->execute([$_SESSION['uid']]); |
|
178 | + $sth->execute([$_SESSION['uid']]); |
|
179 | 179 | |
180 | - } |
|
181 | - break; |
|
182 | - case 'USER_LANGUAGE': |
|
183 | - if (!$need_reload) $need_reload = $_SESSION["language"] != $value; |
|
184 | - break; |
|
185 | - |
|
186 | - case 'USER_CSS_THEME': |
|
187 | - if (!$need_reload) $need_reload = get_pref($pref_name) != $value; |
|
188 | - break; |
|
189 | - } |
|
180 | + } |
|
181 | + break; |
|
182 | + case 'USER_LANGUAGE': |
|
183 | + if (!$need_reload) $need_reload = $_SESSION["language"] != $value; |
|
184 | + break; |
|
190 | 185 | |
191 | - set_pref($pref_name, $value); |
|
192 | - } |
|
186 | + case 'USER_CSS_THEME': |
|
187 | + if (!$need_reload) $need_reload = get_pref($pref_name) != $value; |
|
188 | + break; |
|
189 | + } |
|
193 | 190 | |
194 | - if ($need_reload) { |
|
195 | - print "PREFS_NEED_RELOAD"; |
|
196 | - } else { |
|
197 | - print __("The configuration was saved."); |
|
198 | - } |
|
199 | - } |
|
191 | + set_pref($pref_name, $value); |
|
192 | + } |
|
200 | 193 | |
201 | - public function changeemail() { |
|
194 | + if ($need_reload) { |
|
195 | + print "PREFS_NEED_RELOAD"; |
|
196 | + } else { |
|
197 | + print __("The configuration was saved."); |
|
198 | + } |
|
199 | + } |
|
202 | 200 | |
203 | - $email = clean($_POST["email"]); |
|
204 | - $full_name = clean($_POST["full_name"]); |
|
205 | - $active_uid = $_SESSION["uid"]; |
|
201 | + public function changeemail() { |
|
206 | 202 | |
207 | - $sth = $this->pdo->prepare("SELECT email, login, full_name FROM ttrss_users WHERE id = ?"); |
|
208 | - $sth->execute([$active_uid]); |
|
203 | + $email = clean($_POST["email"]); |
|
204 | + $full_name = clean($_POST["full_name"]); |
|
205 | + $active_uid = $_SESSION["uid"]; |
|
209 | 206 | |
210 | - if ($row = $sth->fetch()) { |
|
211 | - $old_email = $row["email"]; |
|
207 | + $sth = $this->pdo->prepare("SELECT email, login, full_name FROM ttrss_users WHERE id = ?"); |
|
208 | + $sth->execute([$active_uid]); |
|
212 | 209 | |
213 | - if ($old_email != $email) { |
|
214 | - $mailer = new Mailer(); |
|
210 | + if ($row = $sth->fetch()) { |
|
211 | + $old_email = $row["email"]; |
|
215 | 212 | |
216 | - require_once "lib/MiniTemplator.class.php"; |
|
213 | + if ($old_email != $email) { |
|
214 | + $mailer = new Mailer(); |
|
217 | 215 | |
218 | - $tpl = new MiniTemplator; |
|
216 | + require_once "lib/MiniTemplator.class.php"; |
|
219 | 217 | |
220 | - $tpl->readTemplateFromFile("templates/mail_change_template.txt"); |
|
218 | + $tpl = new MiniTemplator; |
|
221 | 219 | |
222 | - $tpl->setVariable('LOGIN', $row["login"]); |
|
223 | - $tpl->setVariable('NEWMAIL', $email); |
|
224 | - $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH); |
|
220 | + $tpl->readTemplateFromFile("templates/mail_change_template.txt"); |
|
225 | 221 | |
226 | - $tpl->addBlock('message'); |
|
222 | + $tpl->setVariable('LOGIN', $row["login"]); |
|
223 | + $tpl->setVariable('NEWMAIL', $email); |
|
224 | + $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH); |
|
227 | 225 | |
228 | - $tpl->generateOutputToString($message); |
|
226 | + $tpl->addBlock('message'); |
|
229 | 227 | |
230 | - $mailer->mail(["to_name" => $row["login"], |
|
231 | - "to_address" => $row["email"], |
|
232 | - "subject" => "[tt-rss] Mail address change notification", |
|
233 | - "message" => $message]); |
|
228 | + $tpl->generateOutputToString($message); |
|
234 | 229 | |
235 | - } |
|
236 | - } |
|
230 | + $mailer->mail(["to_name" => $row["login"], |
|
231 | + "to_address" => $row["email"], |
|
232 | + "subject" => "[tt-rss] Mail address change notification", |
|
233 | + "message" => $message]); |
|
234 | + |
|
235 | + } |
|
236 | + } |
|
237 | 237 | |
238 | - $sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?, |
|
238 | + $sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?, |
|
239 | 239 | full_name = ? WHERE id = ?"); |
240 | - $sth->execute([$email, $full_name, $active_uid]); |
|
240 | + $sth->execute([$email, $full_name, $active_uid]); |
|
241 | 241 | |
242 | - print __("Your personal data has been saved."); |
|
242 | + print __("Your personal data has been saved."); |
|
243 | 243 | |
244 | - return; |
|
245 | - } |
|
244 | + return; |
|
245 | + } |
|
246 | 246 | |
247 | - public function resetconfig() { |
|
247 | + public function resetconfig() { |
|
248 | 248 | |
249 | - $_SESSION["prefs_op_result"] = "reset-to-defaults"; |
|
249 | + $_SESSION["prefs_op_result"] = "reset-to-defaults"; |
|
250 | 250 | |
251 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs |
|
251 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs |
|
252 | 252 | WHERE (profile = :profile OR (:profile IS NULL AND profile IS NULL)) |
253 | 253 | AND owner_uid = :uid"); |
254 | - $sth->execute([":profile" => $_SESSION['profile'], ":uid" => $_SESSION['uid']]); |
|
254 | + $sth->execute([":profile" => $_SESSION['profile'], ":uid" => $_SESSION['uid']]); |
|
255 | 255 | |
256 | - initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]); |
|
256 | + initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]); |
|
257 | 257 | |
258 | - echo __("Your preferences are now set to default values."); |
|
259 | - } |
|
258 | + echo __("Your preferences are now set to default values."); |
|
259 | + } |
|
260 | 260 | |
261 | - public function index() { |
|
261 | + public function index() { |
|
262 | 262 | |
263 | - global $access_level_names; |
|
263 | + global $access_level_names; |
|
264 | 264 | |
265 | - $_SESSION["prefs_op_result"] = ""; |
|
265 | + $_SESSION["prefs_op_result"] = ""; |
|
266 | 266 | |
267 | - print "<div dojoType='dijit.layout.AccordionContainer' region='center'>"; |
|
268 | - print "<div dojoType='dijit.layout.AccordionPane' |
|
267 | + print "<div dojoType='dijit.layout.AccordionContainer' region='center'>"; |
|
268 | + print "<div dojoType='dijit.layout.AccordionPane' |
|
269 | 269 | title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">"; |
270 | 270 | |
271 | - print "<div dojoType='dijit.layout.TabContainer'>"; |
|
272 | - print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">"; |
|
271 | + print "<div dojoType='dijit.layout.TabContainer'>"; |
|
272 | + print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">"; |
|
273 | 273 | |
274 | - print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>"; |
|
274 | + print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>"; |
|
275 | 275 | |
276 | - print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
276 | + print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
277 | 277 | evt.preventDefault(); |
278 | 278 | if (this.validate()) { |
279 | 279 | Notify.progress('Saving data...', true); |
@@ -287,61 +287,61 @@ discard block |
||
287 | 287 | } |
288 | 288 | </script>"; |
289 | 289 | |
290 | - $sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled, |
|
290 | + $sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled, |
|
291 | 291 | access_level FROM ttrss_users |
292 | 292 | WHERE id = ?"); |
293 | - $sth->execute([$_SESSION["uid"]]); |
|
294 | - $row = $sth->fetch(); |
|
295 | - |
|
296 | - $email = htmlspecialchars($row["email"]); |
|
297 | - $full_name = htmlspecialchars($row["full_name"]); |
|
298 | - $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); |
|
299 | - |
|
300 | - print "<fieldset>"; |
|
301 | - print "<label>".__('Full name:')."</label>"; |
|
302 | - print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>"; |
|
303 | - print "</fieldset>"; |
|
304 | - |
|
305 | - print "<fieldset>"; |
|
306 | - print "<label>".__('E-mail:')."</label>"; |
|
307 | - print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>"; |
|
308 | - print "</fieldset>"; |
|
309 | - |
|
310 | - if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) { |
|
311 | - |
|
312 | - $access_level = $row["access_level"]; |
|
313 | - print "<fieldset>"; |
|
314 | - print "<label>".__('Access level:')."</label>"; |
|
315 | - print $access_level_names[$access_level]; |
|
316 | - print "</fieldset>"; |
|
317 | - } |
|
293 | + $sth->execute([$_SESSION["uid"]]); |
|
294 | + $row = $sth->fetch(); |
|
318 | 295 | |
319 | - print_hidden("op", "pref-prefs"); |
|
320 | - print_hidden("method", "changeemail"); |
|
296 | + $email = htmlspecialchars($row["email"]); |
|
297 | + $full_name = htmlspecialchars($row["full_name"]); |
|
298 | + $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); |
|
321 | 299 | |
322 | - print "<hr/>"; |
|
300 | + print "<fieldset>"; |
|
301 | + print "<label>".__('Full name:')."</label>"; |
|
302 | + print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>"; |
|
303 | + print "</fieldset>"; |
|
323 | 304 | |
324 | - print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". |
|
325 | - __("Save data")."</button>"; |
|
305 | + print "<fieldset>"; |
|
306 | + print "<label>".__('E-mail:')."</label>"; |
|
307 | + print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>"; |
|
308 | + print "</fieldset>"; |
|
326 | 309 | |
327 | - print "</form>"; |
|
310 | + if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) { |
|
328 | 311 | |
329 | - print "</div>"; # content pane |
|
330 | - print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">"; |
|
312 | + $access_level = $row["access_level"]; |
|
313 | + print "<fieldset>"; |
|
314 | + print "<label>".__('Access level:')."</label>"; |
|
315 | + print $access_level_names[$access_level]; |
|
316 | + print "</fieldset>"; |
|
317 | + } |
|
331 | 318 | |
332 | - if ($_SESSION["auth_module"]) { |
|
333 | - $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
334 | - } else { |
|
335 | - $authenticator = false; |
|
336 | - } |
|
319 | + print_hidden("op", "pref-prefs"); |
|
320 | + print_hidden("method", "changeemail"); |
|
337 | 321 | |
338 | - if ($authenticator && method_exists($authenticator, "change_password")) { |
|
322 | + print "<hr/>"; |
|
339 | 323 | |
340 | - print "<div style='display : none' id='pwd_change_infobox'></div>"; |
|
324 | + print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". |
|
325 | + __("Save data")."</button>"; |
|
341 | 326 | |
342 | - print "<form dojoType='dijit.form.Form'>"; |
|
327 | + print "</form>"; |
|
343 | 328 | |
344 | - print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
329 | + print "</div>"; # content pane |
|
330 | + print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">"; |
|
331 | + |
|
332 | + if ($_SESSION["auth_module"]) { |
|
333 | + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
334 | + } else { |
|
335 | + $authenticator = false; |
|
336 | + } |
|
337 | + |
|
338 | + if ($authenticator && method_exists($authenticator, "change_password")) { |
|
339 | + |
|
340 | + print "<div style='display : none' id='pwd_change_infobox'></div>"; |
|
341 | + |
|
342 | + print "<form dojoType='dijit.form.Form'>"; |
|
343 | + |
|
344 | + print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
345 | 345 | evt.preventDefault(); |
346 | 346 | if (this.validate()) { |
347 | 347 | Notify.progress('Changing password...', true); |
@@ -370,71 +370,71 @@ discard block |
||
370 | 370 | } |
371 | 371 | </script>"; |
372 | 372 | |
373 | - if ($otp_enabled) { |
|
374 | - print_notice(__("Changing your current password will disable OTP.")); |
|
375 | - } |
|
373 | + if ($otp_enabled) { |
|
374 | + print_notice(__("Changing your current password will disable OTP.")); |
|
375 | + } |
|
376 | 376 | |
377 | - print "<fieldset>"; |
|
378 | - print "<label>".__("Old password:")."</label>"; |
|
379 | - print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>"; |
|
380 | - print "</fieldset>"; |
|
377 | + print "<fieldset>"; |
|
378 | + print "<label>".__("Old password:")."</label>"; |
|
379 | + print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>"; |
|
380 | + print "</fieldset>"; |
|
381 | 381 | |
382 | - print "<fieldset>"; |
|
383 | - print "<label>".__("New password:")."</label>"; |
|
384 | - print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>"; |
|
385 | - print "</fieldset>"; |
|
382 | + print "<fieldset>"; |
|
383 | + print "<label>".__("New password:")."</label>"; |
|
384 | + print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>"; |
|
385 | + print "</fieldset>"; |
|
386 | 386 | |
387 | - print "<fieldset>"; |
|
388 | - print "<label>".__("Confirm password:")."</label>"; |
|
389 | - print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>"; |
|
390 | - print "</fieldset>"; |
|
387 | + print "<fieldset>"; |
|
388 | + print "<label>".__("Confirm password:")."</label>"; |
|
389 | + print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>"; |
|
390 | + print "</fieldset>"; |
|
391 | 391 | |
392 | - print_hidden("op", "pref-prefs"); |
|
393 | - print_hidden("method", "changepassword"); |
|
392 | + print_hidden("op", "pref-prefs"); |
|
393 | + print_hidden("method", "changepassword"); |
|
394 | 394 | |
395 | - print "<hr/>"; |
|
395 | + print "<hr/>"; |
|
396 | 396 | |
397 | - print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". |
|
398 | - __("Change password")."</button>"; |
|
397 | + print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". |
|
398 | + __("Change password")."</button>"; |
|
399 | 399 | |
400 | - print "</form>"; |
|
400 | + print "</form>"; |
|
401 | 401 | |
402 | - print "</div>"; # content pane |
|
402 | + print "</div>"; # content pane |
|
403 | 403 | |
404 | - if ($_SESSION["auth_module"] == "auth_internal") { |
|
404 | + if ($_SESSION["auth_module"] == "auth_internal") { |
|
405 | 405 | |
406 | - print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">"; |
|
406 | + print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">"; |
|
407 | 407 | |
408 | - print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP."); |
|
408 | + print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP."); |
|
409 | 409 | |
410 | - print "<div id='app_passwords_holder'>"; |
|
411 | - $this->appPasswordList(); |
|
412 | - print "</div>"; |
|
410 | + print "<div id='app_passwords_holder'>"; |
|
411 | + $this->appPasswordList(); |
|
412 | + print "</div>"; |
|
413 | 413 | |
414 | - print "<hr>"; |
|
414 | + print "<hr>"; |
|
415 | 415 | |
416 | - print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button' |
|
416 | + print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button' |
|
417 | 417 | onclick=\"Helpers.AppPasswords.generate()\">" . |
418 | - __('Generate new password') . "</button> "; |
|
418 | + __('Generate new password') . "</button> "; |
|
419 | 419 | |
420 | - print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' |
|
420 | + print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' |
|
421 | 421 | onclick=\"Helpers.AppPasswords.removeSelected()\">" . |
422 | - __('Remove selected passwords') . "</button>"; |
|
422 | + __('Remove selected passwords') . "</button>"; |
|
423 | 423 | |
424 | - print "</div>"; # content pane |
|
425 | - } |
|
424 | + print "</div>"; # content pane |
|
425 | + } |
|
426 | 426 | |
427 | - print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">"; |
|
427 | + print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">"; |
|
428 | 428 | |
429 | - if ($_SESSION["auth_module"] == "auth_internal") { |
|
429 | + if ($_SESSION["auth_module"] == "auth_internal") { |
|
430 | 430 | |
431 | - if ($otp_enabled) { |
|
431 | + if ($otp_enabled) { |
|
432 | 432 | |
433 | - print_warning("One time passwords are currently enabled. Enter your current password below to disable."); |
|
433 | + print_warning("One time passwords are currently enabled. Enter your current password below to disable."); |
|
434 | 434 | |
435 | - print "<form dojoType='dijit.form.Form'>"; |
|
435 | + print "<form dojoType='dijit.form.Form'>"; |
|
436 | 436 | |
437 | - print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
437 | + print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
438 | 438 | evt.preventDefault(); |
439 | 439 | if (this.validate()) { |
440 | 440 | Notify.progress('Disabling OTP', true); |
@@ -453,49 +453,49 @@ discard block |
||
453 | 453 | } |
454 | 454 | </script>"; |
455 | 455 | |
456 | - print "<fieldset>"; |
|
457 | - print "<label>".__("Your password:")."</label>"; |
|
458 | - print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>"; |
|
459 | - print "</fieldset>"; |
|
456 | + print "<fieldset>"; |
|
457 | + print "<label>".__("Your password:")."</label>"; |
|
458 | + print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>"; |
|
459 | + print "</fieldset>"; |
|
460 | 460 | |
461 | - print_hidden("op", "pref-prefs"); |
|
462 | - print_hidden("method", "otpdisable"); |
|
461 | + print_hidden("op", "pref-prefs"); |
|
462 | + print_hidden("method", "otpdisable"); |
|
463 | 463 | |
464 | - print "<hr/>"; |
|
464 | + print "<hr/>"; |
|
465 | 465 | |
466 | - print "<button dojoType='dijit.form.Button' type='submit'>". |
|
467 | - __("Disable OTP")."</button>"; |
|
466 | + print "<button dojoType='dijit.form.Button' type='submit'>". |
|
467 | + __("Disable OTP")."</button>"; |
|
468 | 468 | |
469 | - print "</form>"; |
|
469 | + print "</form>"; |
|
470 | 470 | |
471 | - } else { |
|
471 | + } else { |
|
472 | 472 | |
473 | - print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."); |
|
474 | - print_notice("You will need to generate app passwords for the API clients if you enable OTP."); |
|
473 | + print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."); |
|
474 | + print_notice("You will need to generate app passwords for the API clients if you enable OTP."); |
|
475 | 475 | |
476 | - if (function_exists("imagecreatefromstring")) { |
|
477 | - print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>"; |
|
476 | + if (function_exists("imagecreatefromstring")) { |
|
477 | + print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>"; |
|
478 | 478 | |
479 | - $csrf_token = $_SESSION["csrf_token"]; |
|
480 | - print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>"; |
|
481 | - } else { |
|
482 | - print_error("PHP GD functions are required to generate QR codes."); |
|
483 | - print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>"; |
|
484 | - } |
|
479 | + $csrf_token = $_SESSION["csrf_token"]; |
|
480 | + print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>"; |
|
481 | + } else { |
|
482 | + print_error("PHP GD functions are required to generate QR codes."); |
|
483 | + print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>"; |
|
484 | + } |
|
485 | 485 | |
486 | - print "<form dojoType='dijit.form.Form' id='changeOtpForm'>"; |
|
486 | + print "<form dojoType='dijit.form.Form' id='changeOtpForm'>"; |
|
487 | 487 | |
488 | - $otp_secret = $this->otpsecret(); |
|
488 | + $otp_secret = $this->otpsecret(); |
|
489 | 489 | |
490 | - print "<fieldset>"; |
|
491 | - print "<label>".__("OTP Key:")."</label>"; |
|
492 | - print "<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value='$otp_secret' size='32'>"; |
|
493 | - print "</fieldset>"; |
|
490 | + print "<fieldset>"; |
|
491 | + print "<label>".__("OTP Key:")."</label>"; |
|
492 | + print "<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value='$otp_secret' size='32'>"; |
|
493 | + print "</fieldset>"; |
|
494 | 494 | |
495 | - print_hidden("op", "pref-prefs"); |
|
496 | - print_hidden("method", "otpenable"); |
|
495 | + print_hidden("op", "pref-prefs"); |
|
496 | + print_hidden("method", "otpenable"); |
|
497 | 497 | |
498 | - print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
498 | + print "<script type='dojo/method' event='onSubmit' args='evt'> |
|
499 | 499 | evt.preventDefault(); |
500 | 500 | if (this.validate()) { |
501 | 501 | Notify.progress('Saving data...', true); |
@@ -514,43 +514,43 @@ discard block |
||
514 | 514 | } |
515 | 515 | </script>"; |
516 | 516 | |
517 | - print "<fieldset>"; |
|
518 | - print "<label>".__("Your password:")."</label>"; |
|
519 | - print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' |
|
517 | + print "<fieldset>"; |
|
518 | + print "<label>".__("Your password:")."</label>"; |
|
519 | + print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' |
|
520 | 520 | name='password'>"; |
521 | - print "</fieldset>"; |
|
521 | + print "</fieldset>"; |
|
522 | 522 | |
523 | - print "<fieldset>"; |
|
524 | - print "<label>".__("One time password:")."</label>"; |
|
525 | - print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off' |
|
523 | + print "<fieldset>"; |
|
524 | + print "<label>".__("One time password:")."</label>"; |
|
525 | + print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off' |
|
526 | 526 | required='1' name='otp'>"; |
527 | - print "</fieldset>"; |
|
527 | + print "</fieldset>"; |
|
528 | 528 | |
529 | - print "<hr/>"; |
|
530 | - print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". |
|
531 | - __("Enable OTP")."</button>"; |
|
529 | + print "<hr/>"; |
|
530 | + print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". |
|
531 | + __("Enable OTP")."</button>"; |
|
532 | 532 | |
533 | - print "</form>"; |
|
533 | + print "</form>"; |
|
534 | 534 | |
535 | - } |
|
536 | - } |
|
535 | + } |
|
536 | + } |
|
537 | 537 | |
538 | - print "</div>"; # content pane |
|
539 | - print "</div>"; # tab container |
|
538 | + print "</div>"; # content pane |
|
539 | + print "</div>"; # tab container |
|
540 | 540 | |
541 | - } |
|
541 | + } |
|
542 | 542 | |
543 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
544 | - "hook_prefs_tab_section", "prefPrefsAuth"); |
|
543 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
544 | + "hook_prefs_tab_section", "prefPrefsAuth"); |
|
545 | 545 | |
546 | - print "</div>"; #pane |
|
546 | + print "</div>"; #pane |
|
547 | 547 | |
548 | - print "<div dojoType='dijit.layout.AccordionPane' selected='true' |
|
548 | + print "<div dojoType='dijit.layout.AccordionPane' selected='true' |
|
549 | 549 | title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">"; |
550 | 550 | |
551 | - print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>"; |
|
551 | + print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>"; |
|
552 | 552 | |
553 | - print "<script type='dojo/method' event='onSubmit' args='evt, quit'> |
|
553 | + print "<script type='dojo/method' event='onSubmit' args='evt, quit'> |
|
554 | 554 | if (evt) evt.preventDefault(); |
555 | 555 | if (this.validate()) { |
556 | 556 | console.log(dojo.objectToQuery(this.getValues())); |
@@ -572,23 +572,23 @@ discard block |
||
572 | 572 | } |
573 | 573 | </script>"; |
574 | 574 | |
575 | - print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; |
|
575 | + print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; |
|
576 | 576 | |
577 | - print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">'; |
|
577 | + print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">'; |
|
578 | 578 | |
579 | - $profile = $_SESSION["profile"]; |
|
579 | + $profile = $_SESSION["profile"]; |
|
580 | 580 | |
581 | - if ($profile) { |
|
582 | - print_notice(__("Some preferences are only available in default profile.")); |
|
581 | + if ($profile) { |
|
582 | + print_notice(__("Some preferences are only available in default profile.")); |
|
583 | 583 | |
584 | - initialize_user_prefs($_SESSION["uid"], $profile); |
|
585 | - } else { |
|
586 | - initialize_user_prefs($_SESSION["uid"]); |
|
587 | - } |
|
584 | + initialize_user_prefs($_SESSION["uid"], $profile); |
|
585 | + } else { |
|
586 | + initialize_user_prefs($_SESSION["uid"]); |
|
587 | + } |
|
588 | 588 | |
589 | - $prefs_available = []; |
|
589 | + $prefs_available = []; |
|
590 | 590 | |
591 | - $sth = $this->pdo->prepare("SELECT DISTINCT |
|
591 | + $sth = $this->pdo->prepare("SELECT DISTINCT |
|
592 | 592 | ttrss_user_prefs.pref_name,value,type_name, |
593 | 593 | ttrss_prefs_sections.order_id, |
594 | 594 | def_value,section_id |
@@ -599,230 +599,230 @@ discard block |
||
599 | 599 | ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND |
600 | 600 | owner_uid = :uid |
601 | 601 | ORDER BY ttrss_prefs_sections.order_id,pref_name"); |
602 | - $sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]); |
|
602 | + $sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]); |
|
603 | 603 | |
604 | - $listed_boolean_prefs = []; |
|
604 | + $listed_boolean_prefs = []; |
|
605 | 605 | |
606 | - while ($line = $sth->fetch()) { |
|
606 | + while ($line = $sth->fetch()) { |
|
607 | 607 | |
608 | - if (in_array($line["pref_name"], $this->pref_blacklist)) { |
|
609 | - continue; |
|
610 | - } |
|
608 | + if (in_array($line["pref_name"], $this->pref_blacklist)) { |
|
609 | + continue; |
|
610 | + } |
|
611 | 611 | |
612 | - if ($profile && in_array($line["pref_name"], $this->profile_blacklist)) { |
|
613 | - continue; |
|
614 | - } |
|
612 | + if ($profile && in_array($line["pref_name"], $this->profile_blacklist)) { |
|
613 | + continue; |
|
614 | + } |
|
615 | 615 | |
616 | - $pref_name = $line["pref_name"]; |
|
617 | - $short_desc = $this->getShortDesc($pref_name); |
|
616 | + $pref_name = $line["pref_name"]; |
|
617 | + $short_desc = $this->getShortDesc($pref_name); |
|
618 | 618 | |
619 | - if (!$short_desc) |
|
620 | - continue; |
|
619 | + if (!$short_desc) |
|
620 | + continue; |
|
621 | 621 | |
622 | - $prefs_available[$pref_name] = [ |
|
623 | - 'type_name' => $line["type_name"], |
|
624 | - 'value' => $line['value'], |
|
625 | - 'help_text' => $this->getHelpText($pref_name), |
|
626 | - 'short_desc' => $short_desc |
|
627 | - ]; |
|
628 | - } |
|
622 | + $prefs_available[$pref_name] = [ |
|
623 | + 'type_name' => $line["type_name"], |
|
624 | + 'value' => $line['value'], |
|
625 | + 'help_text' => $this->getHelpText($pref_name), |
|
626 | + 'short_desc' => $short_desc |
|
627 | + ]; |
|
628 | + } |
|
629 | 629 | |
630 | - foreach (array_keys($this->pref_item_map) as $section) { |
|
630 | + foreach (array_keys($this->pref_item_map) as $section) { |
|
631 | 631 | |
632 | - print "<h2>$section</h2>"; |
|
632 | + print "<h2>$section</h2>"; |
|
633 | 633 | |
634 | - foreach ($this->pref_item_map[$section] as $pref_name) { |
|
634 | + foreach ($this->pref_item_map[$section] as $pref_name) { |
|
635 | 635 | |
636 | - if ($pref_name == 'BLOCK_SEPARATOR' && !$profile) { |
|
637 | - print "<hr/>"; |
|
638 | - continue; |
|
639 | - } |
|
636 | + if ($pref_name == 'BLOCK_SEPARATOR' && !$profile) { |
|
637 | + print "<hr/>"; |
|
638 | + continue; |
|
639 | + } |
|
640 | 640 | |
641 | - if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") { |
|
642 | - continue; |
|
643 | - } |
|
641 | + if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") { |
|
642 | + continue; |
|
643 | + } |
|
644 | 644 | |
645 | - if ($item = $prefs_available[$pref_name]) { |
|
645 | + if ($item = $prefs_available[$pref_name]) { |
|
646 | 646 | |
647 | - print "<fieldset class='prefs'>"; |
|
647 | + print "<fieldset class='prefs'>"; |
|
648 | 648 | |
649 | - print "<label for='CB_$pref_name'>"; |
|
650 | - print $item['short_desc'] . ":"; |
|
651 | - print "</label>"; |
|
649 | + print "<label for='CB_$pref_name'>"; |
|
650 | + print $item['short_desc'] . ":"; |
|
651 | + print "</label>"; |
|
652 | 652 | |
653 | - $value = $item['value']; |
|
654 | - $type_name = $item['type_name']; |
|
653 | + $value = $item['value']; |
|
654 | + $type_name = $item['type_name']; |
|
655 | 655 | |
656 | - if ($pref_name == "USER_LANGUAGE") { |
|
657 | - print_select_hash($pref_name, $value, get_translations(), |
|
658 | - "style='width : 220px; margin : 0px' dojoType='fox.form.Select'"); |
|
656 | + if ($pref_name == "USER_LANGUAGE") { |
|
657 | + print_select_hash($pref_name, $value, get_translations(), |
|
658 | + "style='width : 220px; margin : 0px' dojoType='fox.form.Select'"); |
|
659 | 659 | |
660 | - } else if ($pref_name == "USER_TIMEZONE") { |
|
660 | + } else if ($pref_name == "USER_TIMEZONE") { |
|
661 | 661 | |
662 | - $timezones = explode("\n", file_get_contents("lib/timezones.txt")); |
|
662 | + $timezones = explode("\n", file_get_contents("lib/timezones.txt")); |
|
663 | 663 | |
664 | - print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"'); |
|
665 | - } else if ($pref_name == "USER_CSS_THEME") { |
|
664 | + print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"'); |
|
665 | + } else if ($pref_name == "USER_CSS_THEME") { |
|
666 | 666 | |
667 | - $themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css")); |
|
668 | - $themes = array_map("basename", $themes); |
|
669 | - $themes = array_filter($themes, "theme_exists"); |
|
670 | - asort($themes); |
|
667 | + $themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css")); |
|
668 | + $themes = array_map("basename", $themes); |
|
669 | + $themes = array_filter($themes, "theme_exists"); |
|
670 | + asort($themes); |
|
671 | 671 | |
672 | - if (!theme_exists($value)) $value = "default.php"; |
|
672 | + if (!theme_exists($value)) $value = "default.php"; |
|
673 | 673 | |
674 | - print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>"; |
|
674 | + print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>"; |
|
675 | 675 | |
676 | - $issel = $value == "default.php" ? "selected='selected'" : ""; |
|
677 | - print "<option $issel value='default.php'>".__("default")."</option>"; |
|
676 | + $issel = $value == "default.php" ? "selected='selected'" : ""; |
|
677 | + print "<option $issel value='default.php'>".__("default")."</option>"; |
|
678 | 678 | |
679 | - foreach ($themes as $theme) { |
|
680 | - $issel = $value == $theme ? "selected='selected'" : ""; |
|
681 | - print "<option $issel value='$theme'>$theme</option>"; |
|
682 | - } |
|
679 | + foreach ($themes as $theme) { |
|
680 | + $issel = $value == $theme ? "selected='selected'" : ""; |
|
681 | + print "<option $issel value='$theme'>$theme</option>"; |
|
682 | + } |
|
683 | 683 | |
684 | - print "</select>"; |
|
684 | + print "</select>"; |
|
685 | 685 | |
686 | - print " <button dojoType=\"dijit.form.Button\" class='alt-info' |
|
686 | + print " <button dojoType=\"dijit.form.Button\" class='alt-info' |
|
687 | 687 | onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>"; |
688 | 688 | |
689 | - print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'> |
|
689 | + print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'> |
|
690 | 690 | <i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>"; |
691 | 691 | |
692 | - } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { |
|
692 | + } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { |
|
693 | 693 | |
694 | - global $update_intervals_nodefault; |
|
694 | + global $update_intervals_nodefault; |
|
695 | 695 | |
696 | - print_select_hash($pref_name, $value, $update_intervals_nodefault, |
|
697 | - 'dojoType="fox.form.Select"'); |
|
698 | - } else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") { |
|
696 | + print_select_hash($pref_name, $value, $update_intervals_nodefault, |
|
697 | + 'dojoType="fox.form.Select"'); |
|
698 | + } else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") { |
|
699 | 699 | |
700 | - print_select($pref_name, $value, Pref_Feeds::get_ts_languages(), |
|
701 | - 'dojoType="fox.form.Select"'); |
|
700 | + print_select($pref_name, $value, Pref_Feeds::get_ts_languages(), |
|
701 | + 'dojoType="fox.form.Select"'); |
|
702 | 702 | |
703 | - } else if ($type_name == "bool") { |
|
703 | + } else if ($type_name == "bool") { |
|
704 | 704 | |
705 | - array_push($listed_boolean_prefs, $pref_name); |
|
705 | + array_push($listed_boolean_prefs, $pref_name); |
|
706 | 706 | |
707 | - $checked = ($value == "true") ? "checked=\"checked\"" : ""; |
|
707 | + $checked = ($value == "true") ? "checked=\"checked\"" : ""; |
|
708 | 708 | |
709 | - if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) { |
|
710 | - $disabled = "disabled=\"1\""; |
|
711 | - $checked = "checked=\"checked\""; |
|
712 | - } else { |
|
713 | - $disabled = ""; |
|
714 | - } |
|
709 | + if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) { |
|
710 | + $disabled = "disabled=\"1\""; |
|
711 | + $checked = "checked=\"checked\""; |
|
712 | + } else { |
|
713 | + $disabled = ""; |
|
714 | + } |
|
715 | 715 | |
716 | - print "<input type='checkbox' name='$pref_name' $checked $disabled |
|
716 | + print "<input type='checkbox' name='$pref_name' $checked $disabled |
|
717 | 717 | dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>"; |
718 | 718 | |
719 | - } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', |
|
720 | - 'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) { |
|
719 | + } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', |
|
720 | + 'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) { |
|
721 | 721 | |
722 | - $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; |
|
722 | + $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; |
|
723 | 723 | |
724 | - if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) { |
|
725 | - $disabled = "disabled='1'"; |
|
726 | - $value = FORCE_ARTICLE_PURGE; |
|
727 | - } else { |
|
728 | - $disabled = ""; |
|
729 | - } |
|
724 | + if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) { |
|
725 | + $disabled = "disabled='1'"; |
|
726 | + $value = FORCE_ARTICLE_PURGE; |
|
727 | + } else { |
|
728 | + $disabled = ""; |
|
729 | + } |
|
730 | 730 | |
731 | - if ($type_name == 'integer') |
|
732 | - print "<input dojoType=\"dijit.form.NumberSpinner\" |
|
731 | + if ($type_name == 'integer') |
|
732 | + print "<input dojoType=\"dijit.form.NumberSpinner\" |
|
733 | 733 | required='1' $disabled |
734 | 734 | name=\"$pref_name\" value=\"$value\">"; |
735 | - else |
|
736 | - print "<input dojoType=\"dijit.form.TextBox\" |
|
735 | + else |
|
736 | + print "<input dojoType=\"dijit.form.TextBox\" |
|
737 | 737 | required='1' $regexp $disabled |
738 | 738 | name=\"$pref_name\" value=\"$value\">"; |
739 | 739 | |
740 | - } else if ($pref_name == "SSL_CERT_SERIAL") { |
|
740 | + } else if ($pref_name == "SSL_CERT_SERIAL") { |
|
741 | 741 | |
742 | - print "<input dojoType='dijit.form.ValidationTextBox' |
|
742 | + print "<input dojoType='dijit.form.ValidationTextBox' |
|
743 | 743 | id='SSL_CERT_SERIAL' readonly='1' |
744 | 744 | name=\"$pref_name\" value=\"$value\">"; |
745 | 745 | |
746 | - $cert_serial = htmlspecialchars(get_ssl_certificate_id()); |
|
747 | - $has_serial = ($cert_serial) ? "false" : "true"; |
|
746 | + $cert_serial = htmlspecialchars(get_ssl_certificate_id()); |
|
747 | + $has_serial = ($cert_serial) ? "false" : "true"; |
|
748 | 748 | |
749 | - print "<button dojoType='dijit.form.Button' disabled='$has_serial' |
|
749 | + print "<button dojoType='dijit.form.Button' disabled='$has_serial' |
|
750 | 750 | onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" . |
751 | - __('Register') . "</button>"; |
|
751 | + __('Register') . "</button>"; |
|
752 | 752 | |
753 | - print "<button dojoType='dijit.form.Button' class='alt-danger' |
|
753 | + print "<button dojoType='dijit.form.Button' class='alt-danger' |
|
754 | 754 | onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" . |
755 | - __('Clear') . "</button>"; |
|
755 | + __('Clear') . "</button>"; |
|
756 | 756 | |
757 | - print "<button dojoType='dijit.form.Button' class='alt-info' |
|
757 | + print "<button dojoType='dijit.form.Button' class='alt-info' |
|
758 | 758 | onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'> |
759 | 759 | <i class='material-icons'>help</i> ".__("More info...")."</button>"; |
760 | 760 | |
761 | - } else if ($pref_name == 'DIGEST_PREFERRED_TIME') { |
|
762 | - print "<input dojoType=\"dijit.form.ValidationTextBox\" |
|
761 | + } else if ($pref_name == 'DIGEST_PREFERRED_TIME') { |
|
762 | + print "<input dojoType=\"dijit.form.ValidationTextBox\" |
|
763 | 763 | id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\" |
764 | 764 | name=\"$pref_name\" value=\"$value\">"; |
765 | 765 | |
766 | - $item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i")); |
|
767 | - } else { |
|
768 | - $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; |
|
766 | + $item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i")); |
|
767 | + } else { |
|
768 | + $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; |
|
769 | 769 | |
770 | - print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">"; |
|
771 | - } |
|
770 | + print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">"; |
|
771 | + } |
|
772 | 772 | |
773 | - if ($item['help_text']) |
|
774 | - print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; |
|
773 | + if ($item['help_text']) |
|
774 | + print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; |
|
775 | 775 | |
776 | - print "</fieldset>"; |
|
777 | - } |
|
778 | - } |
|
779 | - } |
|
776 | + print "</fieldset>"; |
|
777 | + } |
|
778 | + } |
|
779 | + } |
|
780 | 780 | |
781 | - $listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs)); |
|
781 | + $listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs)); |
|
782 | 782 | |
783 | - print_hidden("boolean_prefs", "$listed_boolean_prefs"); |
|
783 | + print_hidden("boolean_prefs", "$listed_boolean_prefs"); |
|
784 | 784 | |
785 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
786 | - "hook_prefs_tab_section", "prefPrefsPrefsInside"); |
|
785 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
786 | + "hook_prefs_tab_section", "prefPrefsPrefsInside"); |
|
787 | 787 | |
788 | - print '</div>'; # inside pane |
|
789 | - print '<div dojoType="dijit.layout.ContentPane" region="bottom">'; |
|
788 | + print '</div>'; # inside pane |
|
789 | + print '<div dojoType="dijit.layout.ContentPane" region="bottom">'; |
|
790 | 790 | |
791 | - print_hidden("op", "pref-prefs"); |
|
792 | - print_hidden("method", "saveconfig"); |
|
791 | + print_hidden("op", "pref-prefs"); |
|
792 | + print_hidden("method", "saveconfig"); |
|
793 | 793 | |
794 | - print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\"> |
|
794 | + print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\"> |
|
795 | 795 | <span>".__('Save configuration')."</span> |
796 | 796 | <div dojoType=\"dijit.DropDownMenu\"> |
797 | 797 | <div dojoType=\"dijit.MenuItem\" |
798 | 798 | onclick=\"dijit.byId('changeSettingsForm').onSubmit(null, true)\">". |
799 | - __("Save and exit preferences")."</div> |
|
799 | + __("Save and exit preferences")."</div> |
|
800 | 800 | </div> |
801 | 801 | </div>"; |
802 | 802 | |
803 | - print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">". |
|
804 | - __('Manage profiles')."</button> "; |
|
803 | + print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">". |
|
804 | + __('Manage profiles')."</button> "; |
|
805 | 805 | |
806 | - print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">". |
|
807 | - __('Reset to defaults')."</button>"; |
|
806 | + print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">". |
|
807 | + __('Reset to defaults')."</button>"; |
|
808 | 808 | |
809 | - print " "; |
|
809 | + print " "; |
|
810 | 810 | |
811 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
812 | - "hook_prefs_tab_section", "prefPrefsPrefsOutside"); |
|
811 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
812 | + "hook_prefs_tab_section", "prefPrefsPrefsOutside"); |
|
813 | 813 | |
814 | - print "</form>"; |
|
815 | - print '</div>'; # inner pane |
|
816 | - print '</div>'; # border container |
|
814 | + print "</form>"; |
|
815 | + print '</div>'; # inner pane |
|
816 | + print '</div>'; # border container |
|
817 | 817 | |
818 | - print "</div>"; #pane |
|
818 | + print "</div>"; #pane |
|
819 | 819 | |
820 | - print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
820 | + print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
821 | 821 | title=\"<i class='material-icons'>extension</i> ".__('Plugins')."\">"; |
822 | 822 | |
823 | - print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">"; |
|
823 | + print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">"; |
|
824 | 824 | |
825 | - print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> |
|
825 | + print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> |
|
826 | 826 | evt.preventDefault(); |
827 | 827 | if (this.validate()) { |
828 | 828 | Notify.progress('Saving data...', true); |
@@ -839,383 +839,383 @@ discard block |
||
839 | 839 | } |
840 | 840 | </script>"; |
841 | 841 | |
842 | - print_hidden("op", "pref-prefs"); |
|
843 | - print_hidden("method", "setplugins"); |
|
842 | + print_hidden("op", "pref-prefs"); |
|
843 | + print_hidden("method", "setplugins"); |
|
844 | 844 | |
845 | - print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; |
|
846 | - print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">'; |
|
845 | + print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; |
|
846 | + print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">'; |
|
847 | 847 | |
848 | - if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) { |
|
849 | - print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly."); |
|
850 | - } |
|
848 | + if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) { |
|
849 | + print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly."); |
|
850 | + } |
|
851 | 851 | |
852 | - $feed_handler_whitelist = [ "Af_Comics" ]; |
|
852 | + $feed_handler_whitelist = [ "Af_Comics" ]; |
|
853 | 853 | |
854 | - $feed_handlers = array_merge( |
|
855 | - PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED), |
|
856 | - PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED), |
|
857 | - PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED)); |
|
854 | + $feed_handlers = array_merge( |
|
855 | + PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED), |
|
856 | + PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED), |
|
857 | + PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED)); |
|
858 | 858 | |
859 | - $feed_handlers = array_filter($feed_handlers, function($plugin) use ($feed_handler_whitelist) { |
|
860 | - return in_array(get_class($plugin), $feed_handler_whitelist) === false; }); |
|
859 | + $feed_handlers = array_filter($feed_handlers, function($plugin) use ($feed_handler_whitelist) { |
|
860 | + return in_array(get_class($plugin), $feed_handler_whitelist) === false; }); |
|
861 | 861 | |
862 | - if (count($feed_handlers) > 0) { |
|
863 | - print_error( |
|
864 | - T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" , |
|
865 | - implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers)) |
|
866 | - ) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)" |
|
867 | - ); |
|
868 | - } |
|
862 | + if (count($feed_handlers) > 0) { |
|
863 | + print_error( |
|
864 | + T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" , |
|
865 | + implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers)) |
|
866 | + ) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)" |
|
867 | + ); |
|
868 | + } |
|
869 | 869 | |
870 | - print "<h2>".__("System plugins")."</h2>"; |
|
871 | - print_notice("System plugins are enabled in <strong>config.php</strong> for all users."); |
|
870 | + print "<h2>".__("System plugins")."</h2>"; |
|
871 | + print_notice("System plugins are enabled in <strong>config.php</strong> for all users."); |
|
872 | 872 | |
873 | - $system_enabled = array_map("trim", explode(",", PLUGINS)); |
|
874 | - $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS"))); |
|
873 | + $system_enabled = array_map("trim", explode(",", PLUGINS)); |
|
874 | + $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS"))); |
|
875 | 875 | |
876 | - $tmppluginhost = new PluginHost(); |
|
877 | - $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true); |
|
878 | - $tmppluginhost->load_data(); |
|
876 | + $tmppluginhost = new PluginHost(); |
|
877 | + $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true); |
|
878 | + $tmppluginhost->load_data(); |
|
879 | 879 | |
880 | - foreach ($tmppluginhost->get_plugins() as $name => $plugin) { |
|
881 | - $about = $plugin->about(); |
|
880 | + foreach ($tmppluginhost->get_plugins() as $name => $plugin) { |
|
881 | + $about = $plugin->about(); |
|
882 | 882 | |
883 | - if ($about[3]) { |
|
884 | - if (in_array($name, $system_enabled)) { |
|
885 | - $checked = "checked='1'"; |
|
886 | - } else { |
|
887 | - $checked = ""; |
|
888 | - } |
|
883 | + if ($about[3]) { |
|
884 | + if (in_array($name, $system_enabled)) { |
|
885 | + $checked = "checked='1'"; |
|
886 | + } else { |
|
887 | + $checked = ""; |
|
888 | + } |
|
889 | 889 | |
890 | - print "<fieldset class='prefs plugin'> |
|
890 | + print "<fieldset class='prefs plugin'> |
|
891 | 891 | <label>$name:</label> |
892 | 892 | <label class='checkbox description text-muted' id='PLABEL-$name'> |
893 | 893 | <input disabled='1' |
894 | 894 | dojoType='dijit.form.CheckBox' $checked type='checkbox'> |
895 | 895 | ".htmlspecialchars($about[1]). "</label>"; |
896 | 896 | |
897 | - if (@$about[4]) { |
|
898 | - print "<button dojoType='dijit.form.Button' class='alt-info' |
|
897 | + if (@$about[4]) { |
|
898 | + print "<button dojoType='dijit.form.Button' class='alt-info' |
|
899 | 899 | onclick='window.open(\"".htmlspecialchars($about[4])."\")'> |
900 | 900 | <i class='material-icons'>open_in_new</i> ".__("More info...")."</button>"; |
901 | - } |
|
901 | + } |
|
902 | 902 | |
903 | - print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>". |
|
904 | - htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])). |
|
905 | - "</div>"; |
|
903 | + print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>". |
|
904 | + htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])). |
|
905 | + "</div>"; |
|
906 | 906 | |
907 | - print "</fieldset>"; |
|
907 | + print "</fieldset>"; |
|
908 | 908 | |
909 | - } |
|
910 | - } |
|
909 | + } |
|
910 | + } |
|
911 | 911 | |
912 | - print "<h2>".__("User plugins")."</h2>"; |
|
912 | + print "<h2>".__("User plugins")."</h2>"; |
|
913 | 913 | |
914 | - foreach ($tmppluginhost->get_plugins() as $name => $plugin) { |
|
915 | - $about = $plugin->about(); |
|
914 | + foreach ($tmppluginhost->get_plugins() as $name => $plugin) { |
|
915 | + $about = $plugin->about(); |
|
916 | 916 | |
917 | - if (!$about[3]) { |
|
917 | + if (!$about[3]) { |
|
918 | 918 | |
919 | - $checked = ""; |
|
920 | - $disabled = ""; |
|
919 | + $checked = ""; |
|
920 | + $disabled = ""; |
|
921 | 921 | |
922 | - if (in_array($name, $system_enabled)) { |
|
923 | - $checked = "checked='1'"; |
|
924 | - $disabled = "disabled='1'"; |
|
925 | - } else if (in_array($name, $user_enabled)) { |
|
926 | - $checked = "checked='1'"; |
|
927 | - } |
|
922 | + if (in_array($name, $system_enabled)) { |
|
923 | + $checked = "checked='1'"; |
|
924 | + $disabled = "disabled='1'"; |
|
925 | + } else if (in_array($name, $user_enabled)) { |
|
926 | + $checked = "checked='1'"; |
|
927 | + } |
|
928 | 928 | |
929 | - print "<fieldset class='prefs plugin'> |
|
929 | + print "<fieldset class='prefs plugin'> |
|
930 | 930 | <label>$name:</label> |
931 | 931 | <label class='checkbox description text-muted' id='PLABEL-$name'> |
932 | 932 | <input name='plugins[]' value='$name' dojoType='dijit.form.CheckBox' $checked $disabled type='checkbox'> |
933 | 933 | ".htmlspecialchars($about[1])."</label>"; |
934 | 934 | |
935 | - if (count($tmppluginhost->get_all($plugin)) > 0) { |
|
936 | - if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) { |
|
937 | - print " <button dojoType='dijit.form.Button' |
|
935 | + if (count($tmppluginhost->get_all($plugin)) > 0) { |
|
936 | + if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) { |
|
937 | + print " <button dojoType='dijit.form.Button' |
|
938 | 938 | onclick=\"Helpers.clearPluginData('$name')\"> |
939 | 939 | <i class='material-icons'>clear</i> ".__("Clear data")."</button>"; |
940 | - } |
|
941 | - } |
|
940 | + } |
|
941 | + } |
|
942 | 942 | |
943 | - if (@$about[4]) { |
|
944 | - print " <button dojoType='dijit.form.Button' class='alt-info' |
|
943 | + if (@$about[4]) { |
|
944 | + print " <button dojoType='dijit.form.Button' class='alt-info' |
|
945 | 945 | onclick='window.open(\"".htmlspecialchars($about[4])."\")'> |
946 | 946 | <i class='material-icons'>open_in_new</i> ".__("More info...")."</button>"; |
947 | - } |
|
947 | + } |
|
948 | 948 | |
949 | - print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>". |
|
950 | - htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])). |
|
951 | - "</div>"; |
|
949 | + print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>". |
|
950 | + htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])). |
|
951 | + "</div>"; |
|
952 | 952 | |
953 | - print "</fieldset>"; |
|
954 | - } |
|
955 | - } |
|
953 | + print "</fieldset>"; |
|
954 | + } |
|
955 | + } |
|
956 | 956 | |
957 | - print "</div>"; #content-pane |
|
958 | - print '<div dojoType="dijit.layout.ContentPane" region="bottom">'; |
|
957 | + print "</div>"; #content-pane |
|
958 | + print '<div dojoType="dijit.layout.ContentPane" region="bottom">'; |
|
959 | 959 | |
960 | - print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/Plugins\")'> |
|
960 | + print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/Plugins\")'> |
|
961 | 961 | <i class='material-icons'>help</i> ".__("More info...")."</button>"; |
962 | 962 | |
963 | - print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>". |
|
964 | - __("Enable selected plugins")."</button>"; |
|
965 | - print "</div>"; #pane |
|
963 | + print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>". |
|
964 | + __("Enable selected plugins")."</button>"; |
|
965 | + print "</div>"; #pane |
|
966 | 966 | |
967 | - print "</div>"; #pane |
|
968 | - print "</div>"; #border-container |
|
967 | + print "</div>"; #pane |
|
968 | + print "</div>"; #border-container |
|
969 | 969 | |
970 | - print "</form>"; |
|
970 | + print "</form>"; |
|
971 | 971 | |
972 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
973 | - "hook_prefs_tab", "prefPrefs"); |
|
972 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
973 | + "hook_prefs_tab", "prefPrefs"); |
|
974 | 974 | |
975 | - print "</div>"; #container |
|
975 | + print "</div>"; #container |
|
976 | 976 | |
977 | - } |
|
977 | + } |
|
978 | 978 | |
979 | - public function toggleAdvanced() { |
|
980 | - $_SESSION["prefs_show_advanced"] = !$_SESSION["prefs_show_advanced"]; |
|
981 | - } |
|
979 | + public function toggleAdvanced() { |
|
980 | + $_SESSION["prefs_show_advanced"] = !$_SESSION["prefs_show_advanced"]; |
|
981 | + } |
|
982 | 982 | |
983 | - public function otpsecret() { |
|
984 | - $sth = $this->pdo->prepare("SELECT salt, otp_enabled |
|
983 | + public function otpsecret() { |
|
984 | + $sth = $this->pdo->prepare("SELECT salt, otp_enabled |
|
985 | 985 | FROM ttrss_users |
986 | 986 | WHERE id = ?"); |
987 | - $sth->execute([$_SESSION['uid']]); |
|
987 | + $sth->execute([$_SESSION['uid']]); |
|
988 | 988 | |
989 | - if ($row = $sth->fetch()) { |
|
990 | - $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); |
|
989 | + if ($row = $sth->fetch()) { |
|
990 | + $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); |
|
991 | 991 | |
992 | - if (!$otp_enabled) { |
|
993 | - $base32 = new \OTPHP\Base32(); |
|
994 | - $secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false); |
|
992 | + if (!$otp_enabled) { |
|
993 | + $base32 = new \OTPHP\Base32(); |
|
994 | + $secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false); |
|
995 | 995 | |
996 | - return $secret; |
|
997 | - } |
|
998 | - } |
|
996 | + return $secret; |
|
997 | + } |
|
998 | + } |
|
999 | 999 | |
1000 | - return false; |
|
1001 | - } |
|
1000 | + return false; |
|
1001 | + } |
|
1002 | 1002 | |
1003 | - public function otpqrcode() { |
|
1004 | - require_once "lib/phpqrcode/phpqrcode.php"; |
|
1003 | + public function otpqrcode() { |
|
1004 | + require_once "lib/phpqrcode/phpqrcode.php"; |
|
1005 | 1005 | |
1006 | - $sth = $this->pdo->prepare("SELECT login |
|
1006 | + $sth = $this->pdo->prepare("SELECT login |
|
1007 | 1007 | FROM ttrss_users |
1008 | 1008 | WHERE id = ?"); |
1009 | - $sth->execute([$_SESSION['uid']]); |
|
1009 | + $sth->execute([$_SESSION['uid']]); |
|
1010 | 1010 | |
1011 | - if ($row = $sth->fetch()) { |
|
1012 | - $secret = $this->otpsecret(); |
|
1013 | - $login = $row['login']; |
|
1011 | + if ($row = $sth->fetch()) { |
|
1012 | + $secret = $this->otpsecret(); |
|
1013 | + $login = $row['login']; |
|
1014 | 1014 | |
1015 | - if ($secret) { |
|
1016 | - QRcode::png("otpauth://totp/".urlencode($login). |
|
1017 | - "?secret=$secret&issuer=".urlencode("Tiny Tiny RSS")); |
|
1018 | - } |
|
1019 | - } |
|
1020 | - } |
|
1015 | + if ($secret) { |
|
1016 | + QRcode::png("otpauth://totp/".urlencode($login). |
|
1017 | + "?secret=$secret&issuer=".urlencode("Tiny Tiny RSS")); |
|
1018 | + } |
|
1019 | + } |
|
1020 | + } |
|
1021 | 1021 | |
1022 | - public function otpenable() { |
|
1022 | + public function otpenable() { |
|
1023 | 1023 | |
1024 | - $password = clean($_REQUEST["password"]); |
|
1025 | - $otp = clean($_REQUEST["otp"]); |
|
1024 | + $password = clean($_REQUEST["password"]); |
|
1025 | + $otp = clean($_REQUEST["otp"]); |
|
1026 | 1026 | |
1027 | - $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
1027 | + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
1028 | 1028 | |
1029 | - if ($authenticator->check_password($_SESSION["uid"], $password)) { |
|
1029 | + if ($authenticator->check_password($_SESSION["uid"], $password)) { |
|
1030 | 1030 | |
1031 | - $secret = $this->otpsecret(); |
|
1031 | + $secret = $this->otpsecret(); |
|
1032 | 1032 | |
1033 | - if ($secret) { |
|
1034 | - $topt = new \OTPHP\TOTP($secret); |
|
1035 | - $otp_check = $topt->now(); |
|
1033 | + if ($secret) { |
|
1034 | + $topt = new \OTPHP\TOTP($secret); |
|
1035 | + $otp_check = $topt->now(); |
|
1036 | 1036 | |
1037 | - if ($otp == $otp_check) { |
|
1038 | - $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = true WHERE id = ?"); |
|
1037 | + if ($otp == $otp_check) { |
|
1038 | + $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = true WHERE id = ?"); |
|
1039 | 1039 | |
1040 | - $sth->execute([$_SESSION['uid']]); |
|
1040 | + $sth->execute([$_SESSION['uid']]); |
|
1041 | 1041 | |
1042 | - print "OK"; |
|
1043 | - } else { |
|
1044 | - print "ERROR:".__("Incorrect one time password"); |
|
1045 | - } |
|
1046 | - } |
|
1042 | + print "OK"; |
|
1043 | + } else { |
|
1044 | + print "ERROR:".__("Incorrect one time password"); |
|
1045 | + } |
|
1046 | + } |
|
1047 | 1047 | |
1048 | - } else { |
|
1049 | - print "ERROR:".__("Incorrect password"); |
|
1050 | - } |
|
1048 | + } else { |
|
1049 | + print "ERROR:".__("Incorrect password"); |
|
1050 | + } |
|
1051 | 1051 | |
1052 | - } |
|
1052 | + } |
|
1053 | 1053 | |
1054 | - public static function isdefaultpassword() { |
|
1055 | - $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
1054 | + public static function isdefaultpassword() { |
|
1055 | + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
1056 | 1056 | |
1057 | - if ($authenticator && |
|
1057 | + if ($authenticator && |
|
1058 | 1058 | method_exists($authenticator, "check_password") && |
1059 | 1059 | $authenticator->check_password($_SESSION["uid"], "password")) { |
1060 | 1060 | |
1061 | - return true; |
|
1062 | - } |
|
1061 | + return true; |
|
1062 | + } |
|
1063 | 1063 | |
1064 | - return false; |
|
1065 | - } |
|
1064 | + return false; |
|
1065 | + } |
|
1066 | 1066 | |
1067 | - public function otpdisable() { |
|
1068 | - $password = clean($_REQUEST["password"]); |
|
1067 | + public function otpdisable() { |
|
1068 | + $password = clean($_REQUEST["password"]); |
|
1069 | 1069 | |
1070 | - $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
1070 | + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); |
|
1071 | 1071 | |
1072 | - if ($authenticator->check_password($_SESSION["uid"], $password)) { |
|
1072 | + if ($authenticator->check_password($_SESSION["uid"], $password)) { |
|
1073 | 1073 | |
1074 | - $sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?"); |
|
1075 | - $sth->execute([$_SESSION['uid']]); |
|
1074 | + $sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?"); |
|
1075 | + $sth->execute([$_SESSION['uid']]); |
|
1076 | 1076 | |
1077 | - if ($row = $sth->fetch()) { |
|
1078 | - $mailer = new Mailer(); |
|
1077 | + if ($row = $sth->fetch()) { |
|
1078 | + $mailer = new Mailer(); |
|
1079 | 1079 | |
1080 | - require_once "lib/MiniTemplator.class.php"; |
|
1080 | + require_once "lib/MiniTemplator.class.php"; |
|
1081 | 1081 | |
1082 | - $tpl = new MiniTemplator; |
|
1082 | + $tpl = new MiniTemplator; |
|
1083 | 1083 | |
1084 | - $tpl->readTemplateFromFile("templates/otp_disabled_template.txt"); |
|
1084 | + $tpl->readTemplateFromFile("templates/otp_disabled_template.txt"); |
|
1085 | 1085 | |
1086 | - $tpl->setVariable('LOGIN', $row["login"]); |
|
1087 | - $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH); |
|
1086 | + $tpl->setVariable('LOGIN', $row["login"]); |
|
1087 | + $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH); |
|
1088 | 1088 | |
1089 | - $tpl->addBlock('message'); |
|
1089 | + $tpl->addBlock('message'); |
|
1090 | 1090 | |
1091 | - $tpl->generateOutputToString($message); |
|
1091 | + $tpl->generateOutputToString($message); |
|
1092 | 1092 | |
1093 | - $mailer->mail(["to_name" => $row["login"], |
|
1094 | - "to_address" => $row["email"], |
|
1095 | - "subject" => "[tt-rss] OTP change notification", |
|
1096 | - "message" => $message]); |
|
1097 | - } |
|
1093 | + $mailer->mail(["to_name" => $row["login"], |
|
1094 | + "to_address" => $row["email"], |
|
1095 | + "subject" => "[tt-rss] OTP change notification", |
|
1096 | + "message" => $message]); |
|
1097 | + } |
|
1098 | 1098 | |
1099 | - $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE |
|
1099 | + $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE |
|
1100 | 1100 | id = ?"); |
1101 | - $sth->execute([$_SESSION['uid']]); |
|
1101 | + $sth->execute([$_SESSION['uid']]); |
|
1102 | 1102 | |
1103 | - print "OK"; |
|
1104 | - } else { |
|
1105 | - print "ERROR: ".__("Incorrect password"); |
|
1106 | - } |
|
1103 | + print "OK"; |
|
1104 | + } else { |
|
1105 | + print "ERROR: ".__("Incorrect password"); |
|
1106 | + } |
|
1107 | 1107 | |
1108 | - } |
|
1108 | + } |
|
1109 | 1109 | |
1110 | - public function setplugins() { |
|
1111 | - if (is_array(clean($_REQUEST["plugins"]))) |
|
1112 | - $plugins = join(",", clean($_REQUEST["plugins"])); |
|
1113 | - else |
|
1114 | - $plugins = ""; |
|
1110 | + public function setplugins() { |
|
1111 | + if (is_array(clean($_REQUEST["plugins"]))) |
|
1112 | + $plugins = join(",", clean($_REQUEST["plugins"])); |
|
1113 | + else |
|
1114 | + $plugins = ""; |
|
1115 | 1115 | |
1116 | - set_pref("_ENABLED_PLUGINS", $plugins); |
|
1117 | - } |
|
1116 | + set_pref("_ENABLED_PLUGINS", $plugins); |
|
1117 | + } |
|
1118 | 1118 | |
1119 | - public function clearplugindata() { |
|
1120 | - $name = clean($_REQUEST["name"]); |
|
1119 | + public function clearplugindata() { |
|
1120 | + $name = clean($_REQUEST["name"]); |
|
1121 | 1121 | |
1122 | - PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name)); |
|
1123 | - } |
|
1122 | + PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name)); |
|
1123 | + } |
|
1124 | 1124 | |
1125 | - public function customizeCSS() { |
|
1126 | - $value = get_pref("USER_STYLESHEET"); |
|
1127 | - $value = str_replace("<br/>", "\n", $value); |
|
1125 | + public function customizeCSS() { |
|
1126 | + $value = get_pref("USER_STYLESHEET"); |
|
1127 | + $value = str_replace("<br/>", "\n", $value); |
|
1128 | 1128 | |
1129 | - print_notice(__("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here.")); |
|
1129 | + print_notice(__("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here.")); |
|
1130 | 1130 | |
1131 | - print_hidden("op", "rpc"); |
|
1132 | - print_hidden("method", "setpref"); |
|
1133 | - print_hidden("key", "USER_STYLESHEET"); |
|
1131 | + print_hidden("op", "rpc"); |
|
1132 | + print_hidden("method", "setpref"); |
|
1133 | + print_hidden("key", "USER_STYLESHEET"); |
|
1134 | 1134 | |
1135 | - print "<div id='css_edit_apply_msg' style='display : none'>"; |
|
1136 | - print_warning(__("User CSS has been applied, you might need to reload the page to see all changes.")); |
|
1137 | - print "</div>"; |
|
1135 | + print "<div id='css_edit_apply_msg' style='display : none'>"; |
|
1136 | + print_warning(__("User CSS has been applied, you might need to reload the page to see all changes.")); |
|
1137 | + print "</div>"; |
|
1138 | 1138 | |
1139 | - print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea' |
|
1139 | + print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea' |
|
1140 | 1140 | style='font-size : 12px;' name='value'>$value</textarea>"; |
1141 | 1141 | |
1142 | - print "<footer>"; |
|
1143 | - print "<button dojoType='dijit.form.Button' class='alt-success' |
|
1142 | + print "<footer>"; |
|
1143 | + print "<button dojoType='dijit.form.Button' class='alt-success' |
|
1144 | 1144 | onclick=\"dijit.byId('cssEditDlg').apply()\">".__('Apply')."</button> "; |
1145 | - print "<button dojoType='dijit.form.Button' class='alt-primary' |
|
1145 | + print "<button dojoType='dijit.form.Button' class='alt-primary' |
|
1146 | 1146 | onclick=\"dijit.byId('cssEditDlg').execute()\">".__('Save and reload')."</button> "; |
1147 | - print "<button dojoType='dijit.form.Button' |
|
1147 | + print "<button dojoType='dijit.form.Button' |
|
1148 | 1148 | onclick=\"dijit.byId('cssEditDlg').hide()\">".__('Cancel')."</button>"; |
1149 | - print "</footer>"; |
|
1149 | + print "</footer>"; |
|
1150 | 1150 | |
1151 | - } |
|
1151 | + } |
|
1152 | 1152 | |
1153 | - public function editPrefProfiles() { |
|
1154 | - print "<div dojoType='fox.Toolbar'>"; |
|
1153 | + public function editPrefProfiles() { |
|
1154 | + print "<div dojoType='fox.Toolbar'>"; |
|
1155 | 1155 | |
1156 | - print "<div dojoType='fox.form.DropDownButton'>". |
|
1157 | - "<span>" . __('Select')."</span>"; |
|
1158 | - print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
1159 | - print "<div onclick=\"Tables.select('pref-profiles-list', true)\" |
|
1156 | + print "<div dojoType='fox.form.DropDownButton'>". |
|
1157 | + "<span>" . __('Select')."</span>"; |
|
1158 | + print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
1159 | + print "<div onclick=\"Tables.select('pref-profiles-list', true)\" |
|
1160 | 1160 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
1161 | - print "<div onclick=\"Tables.select('pref-profiles-list', false)\" |
|
1161 | + print "<div onclick=\"Tables.select('pref-profiles-list', false)\" |
|
1162 | 1162 | dojoType='dijit.MenuItem'>".__('None')."</div>"; |
1163 | - print "</div></div>"; |
|
1163 | + print "</div></div>"; |
|
1164 | 1164 | |
1165 | - print "<div style='float : right'>"; |
|
1165 | + print "<div style='float : right'>"; |
|
1166 | 1166 | |
1167 | - print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox' |
|
1167 | + print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox' |
|
1168 | 1168 | required='1'> |
1169 | 1169 | <button dojoType='dijit.form.Button' |
1170 | 1170 | onclick=\"dijit.byId('profileEditDlg').addProfile()\">". |
1171 | - __('Create profile')."</button></div>"; |
|
1171 | + __('Create profile')."</button></div>"; |
|
1172 | 1172 | |
1173 | - print "</div>"; |
|
1173 | + print "</div>"; |
|
1174 | 1174 | |
1175 | - $sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles |
|
1175 | + $sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles |
|
1176 | 1176 | WHERE owner_uid = ? ORDER BY title"); |
1177 | - $sth->execute([$_SESSION['uid']]); |
|
1177 | + $sth->execute([$_SESSION['uid']]); |
|
1178 | 1178 | |
1179 | - print "<div class='panel panel-scrollable'>"; |
|
1179 | + print "<div class='panel panel-scrollable'>"; |
|
1180 | 1180 | |
1181 | - print "<form id='profile_edit_form' onsubmit='return false'>"; |
|
1181 | + print "<form id='profile_edit_form' onsubmit='return false'>"; |
|
1182 | 1182 | |
1183 | - print "<table width='100%' id='pref-profiles-list'>"; |
|
1183 | + print "<table width='100%' id='pref-profiles-list'>"; |
|
1184 | 1184 | |
1185 | - print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed |
|
1185 | + print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed |
|
1186 | 1186 | |
1187 | - print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
|
1187 | + print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
|
1188 | 1188 | |
1189 | - if (!$_SESSION["profile"]) { |
|
1190 | - $is_active = __("(active)"); |
|
1191 | - } else { |
|
1192 | - $is_active = ""; |
|
1193 | - } |
|
1189 | + if (!$_SESSION["profile"]) { |
|
1190 | + $is_active = __("(active)"); |
|
1191 | + } else { |
|
1192 | + $is_active = ""; |
|
1193 | + } |
|
1194 | 1194 | |
1195 | - print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>"; |
|
1195 | + print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>"; |
|
1196 | 1196 | |
1197 | - print "</tr>"; |
|
1197 | + print "</tr>"; |
|
1198 | 1198 | |
1199 | - while ($line = $sth->fetch()) { |
|
1199 | + while ($line = $sth->fetch()) { |
|
1200 | 1200 | |
1201 | - $profile_id = $line["id"]; |
|
1201 | + $profile_id = $line["id"]; |
|
1202 | 1202 | |
1203 | - print "<tr data-row-id='$profile_id'>"; |
|
1203 | + print "<tr data-row-id='$profile_id'>"; |
|
1204 | 1204 | |
1205 | - $edit_title = htmlspecialchars($line["title"]); |
|
1205 | + $edit_title = htmlspecialchars($line["title"]); |
|
1206 | 1206 | |
1207 | - print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
|
1207 | + print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
|
1208 | 1208 | |
1209 | - if ($_SESSION["profile"] == $line["id"]) { |
|
1210 | - $is_active = __("(active)"); |
|
1211 | - } else { |
|
1212 | - $is_active = ""; |
|
1213 | - } |
|
1209 | + if ($_SESSION["profile"] == $line["id"]) { |
|
1210 | + $is_active = __("(active)"); |
|
1211 | + } else { |
|
1212 | + $is_active = ""; |
|
1213 | + } |
|
1214 | 1214 | |
1215 | - print "<td><span dojoType='dijit.InlineEditBox' |
|
1215 | + print "<td><span dojoType='dijit.InlineEditBox' |
|
1216 | 1216 | width='300px' autoSave='false' |
1217 | 1217 | profile-id='$profile_id'>" . $edit_title . |
1218 | - "<script type='dojo/method' event='onChange' args='item'> |
|
1218 | + "<script type='dojo/method' event='onChange' args='item'> |
|
1219 | 1219 | var elem = this; |
1220 | 1220 | dojo.xhrPost({ |
1221 | 1221 | url: 'backend.php', |
@@ -1229,118 +1229,118 @@ discard block |
||
1229 | 1229 | </script> |
1230 | 1230 | </span> $is_active</td>"; |
1231 | 1231 | |
1232 | - print "</tr>"; |
|
1233 | - } |
|
1232 | + print "</tr>"; |
|
1233 | + } |
|
1234 | 1234 | |
1235 | - print "</table>"; |
|
1236 | - print "</form>"; |
|
1237 | - print "</div>"; |
|
1235 | + print "</table>"; |
|
1236 | + print "</form>"; |
|
1237 | + print "</div>"; |
|
1238 | 1238 | |
1239 | - print "<footer> |
|
1239 | + print "<footer> |
|
1240 | 1240 | <button style='float : left' class='alt-danger' dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">". |
1241 | - __('Remove selected profiles')."</button> |
|
1241 | + __('Remove selected profiles')."</button> |
|
1242 | 1242 | <button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('profileEditDlg').activateProfile()\">". |
1243 | - __('Activate profile')."</button> |
|
1243 | + __('Activate profile')."</button> |
|
1244 | 1244 | <button dojoType='dijit.form.Button' onclick=\"dijit.byId('profileEditDlg').hide()\">". |
1245 | - __('Cancel')."</button>"; |
|
1246 | - print "</footer>"; |
|
1247 | - |
|
1248 | - } |
|
1249 | - |
|
1250 | - private function getShortDesc($pref_name) { |
|
1251 | - if (isset($this->pref_help[$pref_name])) { |
|
1252 | - return $this->pref_help[$pref_name][0]; |
|
1253 | - } |
|
1254 | - return ""; |
|
1255 | - } |
|
1256 | - |
|
1257 | - private function getHelpText($pref_name) { |
|
1258 | - if (isset($this->pref_help[$pref_name])) { |
|
1259 | - return $this->pref_help[$pref_name][1]; |
|
1260 | - } |
|
1261 | - return ""; |
|
1262 | - } |
|
1263 | - |
|
1264 | - private function appPasswordList() { |
|
1265 | - print "<div dojoType='fox.Toolbar'>"; |
|
1266 | - print "<div dojoType='fox.form.DropDownButton'>" . |
|
1267 | - "<span>" . __('Select') . "</span>"; |
|
1268 | - print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
1269 | - print "<div onclick=\"Tables.select('app-password-list', true)\" |
|
1245 | + __('Cancel')."</button>"; |
|
1246 | + print "</footer>"; |
|
1247 | + |
|
1248 | + } |
|
1249 | + |
|
1250 | + private function getShortDesc($pref_name) { |
|
1251 | + if (isset($this->pref_help[$pref_name])) { |
|
1252 | + return $this->pref_help[$pref_name][0]; |
|
1253 | + } |
|
1254 | + return ""; |
|
1255 | + } |
|
1256 | + |
|
1257 | + private function getHelpText($pref_name) { |
|
1258 | + if (isset($this->pref_help[$pref_name])) { |
|
1259 | + return $this->pref_help[$pref_name][1]; |
|
1260 | + } |
|
1261 | + return ""; |
|
1262 | + } |
|
1263 | + |
|
1264 | + private function appPasswordList() { |
|
1265 | + print "<div dojoType='fox.Toolbar'>"; |
|
1266 | + print "<div dojoType='fox.form.DropDownButton'>" . |
|
1267 | + "<span>" . __('Select') . "</span>"; |
|
1268 | + print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
1269 | + print "<div onclick=\"Tables.select('app-password-list', true)\" |
|
1270 | 1270 | dojoType=\"dijit.MenuItem\">" . __('All') . "</div>"; |
1271 | - print "<div onclick=\"Tables.select('app-password-list', false)\" |
|
1271 | + print "<div onclick=\"Tables.select('app-password-list', false)\" |
|
1272 | 1272 | dojoType=\"dijit.MenuItem\">" . __('None') . "</div>"; |
1273 | - print "</div></div>"; |
|
1274 | - print "</div>"; #toolbar |
|
1275 | - |
|
1276 | - print "<div class='panel panel-scrollable'>"; |
|
1277 | - print "<table width='100%' id='app-password-list'>"; |
|
1278 | - print "<tr>"; |
|
1279 | - print "<th width='2%'></th>"; |
|
1280 | - print "<th align='left'>".__("Description")."</th>"; |
|
1281 | - print "<th align='right'>".__("Created")."</th>"; |
|
1282 | - print "<th align='right'>".__("Last used")."</th>"; |
|
1283 | - print "</tr>"; |
|
1284 | - |
|
1285 | - $sth = $this->pdo->prepare("SELECT id, title, created, last_used |
|
1273 | + print "</div></div>"; |
|
1274 | + print "</div>"; #toolbar |
|
1275 | + |
|
1276 | + print "<div class='panel panel-scrollable'>"; |
|
1277 | + print "<table width='100%' id='app-password-list'>"; |
|
1278 | + print "<tr>"; |
|
1279 | + print "<th width='2%'></th>"; |
|
1280 | + print "<th align='left'>".__("Description")."</th>"; |
|
1281 | + print "<th align='right'>".__("Created")."</th>"; |
|
1282 | + print "<th align='right'>".__("Last used")."</th>"; |
|
1283 | + print "</tr>"; |
|
1284 | + |
|
1285 | + $sth = $this->pdo->prepare("SELECT id, title, created, last_used |
|
1286 | 1286 | FROM ttrss_app_passwords WHERE owner_uid = ?"); |
1287 | - $sth->execute([$_SESSION['uid']]); |
|
1287 | + $sth->execute([$_SESSION['uid']]); |
|
1288 | 1288 | |
1289 | - while ($row = $sth->fetch()) { |
|
1289 | + while ($row = $sth->fetch()) { |
|
1290 | 1290 | |
1291 | - $row_id = $row["id"]; |
|
1291 | + $row_id = $row["id"]; |
|
1292 | 1292 | |
1293 | - print "<tr data-row-id='$row_id'>"; |
|
1293 | + print "<tr data-row-id='$row_id'>"; |
|
1294 | 1294 | |
1295 | - print "<td align='center'> |
|
1295 | + print "<td align='center'> |
|
1296 | 1296 | <input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
1297 | - print "<td>" . htmlspecialchars($row["title"]) . "</td>"; |
|
1297 | + print "<td>" . htmlspecialchars($row["title"]) . "</td>"; |
|
1298 | 1298 | |
1299 | - print "<td align='right' class='text-muted'>"; |
|
1300 | - print make_local_datetime($row['created'], false); |
|
1301 | - print "</td>"; |
|
1299 | + print "<td align='right' class='text-muted'>"; |
|
1300 | + print make_local_datetime($row['created'], false); |
|
1301 | + print "</td>"; |
|
1302 | 1302 | |
1303 | - print "<td align='right' class='text-muted'>"; |
|
1304 | - print make_local_datetime($row['last_used'], false); |
|
1305 | - print "</td>"; |
|
1303 | + print "<td align='right' class='text-muted'>"; |
|
1304 | + print make_local_datetime($row['last_used'], false); |
|
1305 | + print "</td>"; |
|
1306 | 1306 | |
1307 | - print "</tr>"; |
|
1308 | - } |
|
1307 | + print "</tr>"; |
|
1308 | + } |
|
1309 | 1309 | |
1310 | - print "</table>"; |
|
1311 | - print "</div>"; |
|
1312 | - } |
|
1310 | + print "</table>"; |
|
1311 | + print "</div>"; |
|
1312 | + } |
|
1313 | 1313 | |
1314 | - private function encryptAppPassword($password) { |
|
1315 | - $salt = substr(bin2hex(get_random_bytes(24)), 0, 24); |
|
1314 | + private function encryptAppPassword($password) { |
|
1315 | + $salt = substr(bin2hex(get_random_bytes(24)), 0, 24); |
|
1316 | 1316 | |
1317 | - return "SSHA-512:".hash('sha512', $salt . $password). ":$salt"; |
|
1318 | - } |
|
1317 | + return "SSHA-512:".hash('sha512', $salt . $password). ":$salt"; |
|
1318 | + } |
|
1319 | 1319 | |
1320 | - public function deleteAppPassword() { |
|
1321 | - $ids = explode(",", clean($_REQUEST['ids'])); |
|
1322 | - $ids_qmarks = arr_qmarks($ids); |
|
1320 | + public function deleteAppPassword() { |
|
1321 | + $ids = explode(",", clean($_REQUEST['ids'])); |
|
1322 | + $ids_qmarks = arr_qmarks($ids); |
|
1323 | 1323 | |
1324 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?"); |
|
1325 | - $sth->execute(array_merge($ids, [$_SESSION['uid']])); |
|
1324 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?"); |
|
1325 | + $sth->execute(array_merge($ids, [$_SESSION['uid']])); |
|
1326 | 1326 | |
1327 | - $this->appPasswordList(); |
|
1328 | - } |
|
1327 | + $this->appPasswordList(); |
|
1328 | + } |
|
1329 | 1329 | |
1330 | - public function generateAppPassword() { |
|
1331 | - $title = clean($_REQUEST['title']); |
|
1332 | - $new_password = make_password(16); |
|
1333 | - $new_password_hash = $this->encryptAppPassword($new_password); |
|
1330 | + public function generateAppPassword() { |
|
1331 | + $title = clean($_REQUEST['title']); |
|
1332 | + $new_password = make_password(16); |
|
1333 | + $new_password_hash = $this->encryptAppPassword($new_password); |
|
1334 | 1334 | |
1335 | - print_warning(T_sprintf("Generated password <strong>%s</strong> for %s. Please remember it for future reference.", $new_password, $title)); |
|
1335 | + print_warning(T_sprintf("Generated password <strong>%s</strong> for %s. Please remember it for future reference.", $new_password, $title)); |
|
1336 | 1336 | |
1337 | - $sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords |
|
1337 | + $sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords |
|
1338 | 1338 | (title, pwd_hash, service, created, owner_uid) |
1339 | 1339 | VALUES |
1340 | 1340 | (?, ?, ?, NOW(), ?)"); |
1341 | 1341 | |
1342 | - $sth->execute([$title, $new_password_hash, Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]); |
|
1342 | + $sth->execute([$title, $new_password_hash, Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]); |
|
1343 | 1343 | |
1344 | - $this->appPasswordList(); |
|
1345 | - } |
|
1344 | + $this->appPasswordList(); |
|
1345 | + } |
|
1346 | 1346 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | print "</section>"; |
37 | 37 | |
38 | - print "<header>" . __("Colors") . "</header>"; |
|
38 | + print "<header>".__("Colors")."</header>"; |
|
39 | 39 | print "<section>"; |
40 | 40 | |
41 | 41 | print "<table>"; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | while ($line = $sth->fetch()) { |
95 | 95 | $label = array(); |
96 | - $label['id'] = 'LABEL:' . $line['id']; |
|
96 | + $label['id'] = 'LABEL:'.$line['id']; |
|
97 | 97 | $label['bare_id'] = $line['id']; |
98 | 98 | $label['name'] = $line['caption']; |
99 | 99 | $label['fg_color'] = $line['fg_color']; |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | print "<div dojoType='fox.Toolbar'>"; |
255 | 255 | |
256 | 256 | print "<div dojoType='fox.form.DropDownButton'>". |
257 | - "<span>" . __('Select')."</span>"; |
|
257 | + "<span>".__('Select')."</span>"; |
|
258 | 258 | print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
259 | 259 | print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\" |
260 | 260 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
@@ -1,286 +1,286 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | class Pref_Labels extends Handler_Protected { |
3 | 3 | |
4 | - public function csrf_ignore($method) { |
|
5 | - $csrf_ignored = array("index", "getlabeltree", "edit"); |
|
4 | + public function csrf_ignore($method) { |
|
5 | + $csrf_ignored = array("index", "getlabeltree", "edit"); |
|
6 | 6 | |
7 | - return array_search($method, $csrf_ignored) !== false; |
|
8 | - } |
|
7 | + return array_search($method, $csrf_ignored) !== false; |
|
8 | + } |
|
9 | 9 | |
10 | - public function edit() { |
|
11 | - $label_id = clean($_REQUEST['id']); |
|
10 | + public function edit() { |
|
11 | + $label_id = clean($_REQUEST['id']); |
|
12 | 12 | |
13 | - $sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE |
|
13 | + $sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE |
|
14 | 14 | id = ? AND owner_uid = ?"); |
15 | - $sth->execute([$label_id, $_SESSION['uid']]); |
|
15 | + $sth->execute([$label_id, $_SESSION['uid']]); |
|
16 | 16 | |
17 | - if ($line = $sth->fetch()) { |
|
17 | + if ($line = $sth->fetch()) { |
|
18 | 18 | |
19 | - print_hidden("id", "$label_id"); |
|
20 | - print_hidden("op", "pref-labels"); |
|
21 | - print_hidden("method", "save"); |
|
19 | + print_hidden("id", "$label_id"); |
|
20 | + print_hidden("op", "pref-labels"); |
|
21 | + print_hidden("method", "save"); |
|
22 | 22 | |
23 | - print "<form onsubmit='return false;'>"; |
|
23 | + print "<form onsubmit='return false;'>"; |
|
24 | 24 | |
25 | - print "<header>".__("Caption")."</header>"; |
|
25 | + print "<header>".__("Caption")."</header>"; |
|
26 | 26 | |
27 | - print "<section>"; |
|
27 | + print "<section>"; |
|
28 | 28 | |
29 | - $fg_color = $line['fg_color']; |
|
30 | - $bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5'; |
|
29 | + $fg_color = $line['fg_color']; |
|
30 | + $bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5'; |
|
31 | 31 | |
32 | - print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear' |
|
32 | + print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear' |
|
33 | 33 | id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox' |
34 | 34 | required='true' value=\"".htmlspecialchars($line['caption'])."\">"; |
35 | 35 | |
36 | - print "</section>"; |
|
36 | + print "</section>"; |
|
37 | 37 | |
38 | - print "<header>" . __("Colors") . "</header>"; |
|
39 | - print "<section>"; |
|
38 | + print "<header>" . __("Colors") . "</header>"; |
|
39 | + print "<section>"; |
|
40 | 40 | |
41 | - print "<table>"; |
|
42 | - print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>"; |
|
43 | - print "<tr><td style='padding-right : 10px'>"; |
|
41 | + print "<table>"; |
|
42 | + print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>"; |
|
43 | + print "<tr><td style='padding-right : 10px'>"; |
|
44 | 44 | |
45 | - print "<input dojoType='dijit.form.TextBox' |
|
45 | + print "<input dojoType='dijit.form.TextBox' |
|
46 | 46 | style='display : none' id='labelEdit_fgColor' |
47 | 47 | name='fg_color' value='$fg_color'>"; |
48 | - print "<input dojoType='dijit.form.TextBox' |
|
48 | + print "<input dojoType='dijit.form.TextBox' |
|
49 | 49 | style='display : none' id='labelEdit_bgColor' |
50 | 50 | name='bg_color' value='$bg_color'>"; |
51 | 51 | |
52 | - print "<div dojoType='dijit.ColorPalette'> |
|
52 | + print "<div dojoType='dijit.ColorPalette'> |
|
53 | 53 | <script type='dojo/method' event='onChange' args='fg_color'> |
54 | 54 | dijit.byId('labelEdit_fgColor').attr('value', fg_color); |
55 | 55 | dijit.byId('labelEdit_caption').domNode.setStyle({color: fg_color}); |
56 | 56 | </script> |
57 | 57 | </div>"; |
58 | 58 | |
59 | - print "</td><td>"; |
|
59 | + print "</td><td>"; |
|
60 | 60 | |
61 | - print "<div dojoType='dijit.ColorPalette'> |
|
61 | + print "<div dojoType='dijit.ColorPalette'> |
|
62 | 62 | <script type='dojo/method' event='onChange' args='bg_color'> |
63 | 63 | dijit.byId('labelEdit_bgColor').attr('value', bg_color); |
64 | 64 | dijit.byId('labelEdit_caption').domNode.setStyle({backgroundColor: bg_color}); |
65 | 65 | </script> |
66 | 66 | </div>"; |
67 | 67 | |
68 | - print "</td></tr></table>"; |
|
69 | - print "</section>"; |
|
68 | + print "</td></tr></table>"; |
|
69 | + print "</section>"; |
|
70 | 70 | |
71 | - print "<footer>"; |
|
72 | - print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">". |
|
73 | - __('Save')."</button>"; |
|
74 | - print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">". |
|
75 | - __('Cancel')."</button>"; |
|
76 | - print "</footer>"; |
|
71 | + print "<footer>"; |
|
72 | + print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">". |
|
73 | + __('Save')."</button>"; |
|
74 | + print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">". |
|
75 | + __('Cancel')."</button>"; |
|
76 | + print "</footer>"; |
|
77 | 77 | |
78 | - print "</form>"; |
|
79 | - } |
|
80 | - } |
|
78 | + print "</form>"; |
|
79 | + } |
|
80 | + } |
|
81 | 81 | |
82 | - public function getlabeltree() { |
|
83 | - $root = array(); |
|
84 | - $root['id'] = 'root'; |
|
85 | - $root['name'] = __('Labels'); |
|
86 | - $root['items'] = array(); |
|
82 | + public function getlabeltree() { |
|
83 | + $root = array(); |
|
84 | + $root['id'] = 'root'; |
|
85 | + $root['name'] = __('Labels'); |
|
86 | + $root['items'] = array(); |
|
87 | 87 | |
88 | - $sth = $this->pdo->prepare("SELECT * |
|
88 | + $sth = $this->pdo->prepare("SELECT * |
|
89 | 89 | FROM ttrss_labels2 |
90 | 90 | WHERE owner_uid = ? |
91 | 91 | ORDER BY caption"); |
92 | - $sth->execute([$_SESSION['uid']]); |
|
93 | - |
|
94 | - while ($line = $sth->fetch()) { |
|
95 | - $label = array(); |
|
96 | - $label['id'] = 'LABEL:' . $line['id']; |
|
97 | - $label['bare_id'] = $line['id']; |
|
98 | - $label['name'] = $line['caption']; |
|
99 | - $label['fg_color'] = $line['fg_color']; |
|
100 | - $label['bg_color'] = $line['bg_color']; |
|
101 | - $label['type'] = 'label'; |
|
102 | - $label['checkbox'] = false; |
|
103 | - |
|
104 | - array_push($root['items'], $label); |
|
105 | - } |
|
106 | - |
|
107 | - $fl = array(); |
|
108 | - $fl['identifier'] = 'id'; |
|
109 | - $fl['label'] = 'name'; |
|
110 | - $fl['items'] = array($root); |
|
111 | - |
|
112 | - print json_encode($fl); |
|
113 | - return; |
|
114 | - } |
|
115 | - |
|
116 | - public function colorset() { |
|
117 | - $kind = clean($_REQUEST["kind"]); |
|
118 | - $ids = explode(',', clean($_REQUEST["ids"])); |
|
119 | - $color = clean($_REQUEST["color"]); |
|
120 | - $fg = clean($_REQUEST["fg"]); |
|
121 | - $bg = clean($_REQUEST["bg"]); |
|
122 | - |
|
123 | - foreach ($ids as $id) { |
|
124 | - |
|
125 | - if ($kind == "fg" || $kind == "bg") { |
|
126 | - $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
92 | + $sth->execute([$_SESSION['uid']]); |
|
93 | + |
|
94 | + while ($line = $sth->fetch()) { |
|
95 | + $label = array(); |
|
96 | + $label['id'] = 'LABEL:' . $line['id']; |
|
97 | + $label['bare_id'] = $line['id']; |
|
98 | + $label['name'] = $line['caption']; |
|
99 | + $label['fg_color'] = $line['fg_color']; |
|
100 | + $label['bg_color'] = $line['bg_color']; |
|
101 | + $label['type'] = 'label'; |
|
102 | + $label['checkbox'] = false; |
|
103 | + |
|
104 | + array_push($root['items'], $label); |
|
105 | + } |
|
106 | + |
|
107 | + $fl = array(); |
|
108 | + $fl['identifier'] = 'id'; |
|
109 | + $fl['label'] = 'name'; |
|
110 | + $fl['items'] = array($root); |
|
111 | + |
|
112 | + print json_encode($fl); |
|
113 | + return; |
|
114 | + } |
|
115 | + |
|
116 | + public function colorset() { |
|
117 | + $kind = clean($_REQUEST["kind"]); |
|
118 | + $ids = explode(',', clean($_REQUEST["ids"])); |
|
119 | + $color = clean($_REQUEST["color"]); |
|
120 | + $fg = clean($_REQUEST["fg"]); |
|
121 | + $bg = clean($_REQUEST["bg"]); |
|
122 | + |
|
123 | + foreach ($ids as $id) { |
|
124 | + |
|
125 | + if ($kind == "fg" || $kind == "bg") { |
|
126 | + $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
127 | 127 | ${kind}_color = ? WHERE id = ? |
128 | 128 | AND owner_uid = ?"); |
129 | 129 | |
130 | - $sth->execute([$color, $id, $_SESSION['uid']]); |
|
130 | + $sth->execute([$color, $id, $_SESSION['uid']]); |
|
131 | 131 | |
132 | - } else { |
|
132 | + } else { |
|
133 | 133 | |
134 | - $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
134 | + $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
135 | 135 | fg_color = ?, bg_color = ? WHERE id = ? |
136 | 136 | AND owner_uid = ?"); |
137 | 137 | |
138 | - $sth->execute([$fg, $bg, $id, $_SESSION['uid']]); |
|
139 | - } |
|
138 | + $sth->execute([$fg, $bg, $id, $_SESSION['uid']]); |
|
139 | + } |
|
140 | 140 | |
141 | - /* Remove cached data */ |
|
141 | + /* Remove cached data */ |
|
142 | 142 | |
143 | - $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' |
|
143 | + $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' |
|
144 | 144 | WHERE owner_uid = ?"); |
145 | - $sth->execute([$_SESSION['uid']]); |
|
146 | - } |
|
147 | - } |
|
145 | + $sth->execute([$_SESSION['uid']]); |
|
146 | + } |
|
147 | + } |
|
148 | 148 | |
149 | - public function colorreset() { |
|
150 | - $ids = explode(',', clean($_REQUEST["ids"])); |
|
149 | + public function colorreset() { |
|
150 | + $ids = explode(',', clean($_REQUEST["ids"])); |
|
151 | 151 | |
152 | - foreach ($ids as $id) { |
|
153 | - $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
152 | + foreach ($ids as $id) { |
|
153 | + $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
154 | 154 | fg_color = '', bg_color = '' WHERE id = ? |
155 | 155 | AND owner_uid = ?"); |
156 | - $sth->execute([$id, $_SESSION['uid']]); |
|
156 | + $sth->execute([$id, $_SESSION['uid']]); |
|
157 | 157 | |
158 | - /* Remove cached data */ |
|
158 | + /* Remove cached data */ |
|
159 | 159 | |
160 | - $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' |
|
160 | + $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' |
|
161 | 161 | WHERE owner_uid = ?"); |
162 | - $sth->execute([$_SESSION['uid']]); |
|
163 | - } |
|
164 | - } |
|
162 | + $sth->execute([$_SESSION['uid']]); |
|
163 | + } |
|
164 | + } |
|
165 | 165 | |
166 | - public function save() { |
|
166 | + public function save() { |
|
167 | 167 | |
168 | - $id = clean($_REQUEST["id"]); |
|
169 | - $caption = trim(clean($_REQUEST["caption"])); |
|
168 | + $id = clean($_REQUEST["id"]); |
|
169 | + $caption = trim(clean($_REQUEST["caption"])); |
|
170 | 170 | |
171 | - $this->pdo->beginTransaction(); |
|
171 | + $this->pdo->beginTransaction(); |
|
172 | 172 | |
173 | - $sth = $this->pdo->prepare("SELECT caption FROM ttrss_labels2 |
|
173 | + $sth = $this->pdo->prepare("SELECT caption FROM ttrss_labels2 |
|
174 | 174 | WHERE id = ? AND owner_uid = ?"); |
175 | - $sth->execute([$id, $_SESSION['uid']]); |
|
175 | + $sth->execute([$id, $_SESSION['uid']]); |
|
176 | 176 | |
177 | - if ($row = $sth->fetch()) { |
|
178 | - $old_caption = $row["caption"]; |
|
177 | + if ($row = $sth->fetch()) { |
|
178 | + $old_caption = $row["caption"]; |
|
179 | 179 | |
180 | - $sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2 |
|
180 | + $sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2 |
|
181 | 181 | WHERE caption = ? AND owner_uid = ?"); |
182 | - $sth->execute([$caption, $_SESSION['uid']]); |
|
182 | + $sth->execute([$caption, $_SESSION['uid']]); |
|
183 | 183 | |
184 | - if (!$sth->fetch()) { |
|
185 | - if ($caption) { |
|
186 | - $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
184 | + if (!$sth->fetch()) { |
|
185 | + if ($caption) { |
|
186 | + $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET |
|
187 | 187 | caption = ? WHERE id = ? AND |
188 | 188 | owner_uid = ?"); |
189 | - $sth->execute([$caption, $id, $_SESSION['uid']]); |
|
189 | + $sth->execute([$caption, $id, $_SESSION['uid']]); |
|
190 | 190 | |
191 | - /* Update filters that reference label being renamed */ |
|
191 | + /* Update filters that reference label being renamed */ |
|
192 | 192 | |
193 | - $sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions SET |
|
193 | + $sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions SET |
|
194 | 194 | action_param = ? WHERE action_param = ? |
195 | 195 | AND action_id = 7 |
196 | 196 | AND filter_id IN (SELECT id FROM ttrss_filters2 WHERE owner_uid = ?)"); |
197 | 197 | |
198 | - $sth->execute([$caption, $old_caption, $_SESSION['uid']]); |
|
198 | + $sth->execute([$caption, $old_caption, $_SESSION['uid']]); |
|
199 | 199 | |
200 | - print clean($_REQUEST["value"]); |
|
201 | - } else { |
|
202 | - print $old_caption; |
|
203 | - } |
|
204 | - } else { |
|
205 | - print $old_caption; |
|
206 | - } |
|
207 | - } |
|
200 | + print clean($_REQUEST["value"]); |
|
201 | + } else { |
|
202 | + print $old_caption; |
|
203 | + } |
|
204 | + } else { |
|
205 | + print $old_caption; |
|
206 | + } |
|
207 | + } |
|
208 | 208 | |
209 | - $this->pdo->commit(); |
|
209 | + $this->pdo->commit(); |
|
210 | 210 | |
211 | - } |
|
211 | + } |
|
212 | 212 | |
213 | - public function remove() { |
|
213 | + public function remove() { |
|
214 | 214 | |
215 | - $ids = explode(",", clean($_REQUEST["ids"])); |
|
215 | + $ids = explode(",", clean($_REQUEST["ids"])); |
|
216 | 216 | |
217 | - foreach ($ids as $id) { |
|
218 | - Labels::remove($id, $_SESSION["uid"]); |
|
219 | - } |
|
217 | + foreach ($ids as $id) { |
|
218 | + Labels::remove($id, $_SESSION["uid"]); |
|
219 | + } |
|
220 | 220 | |
221 | - } |
|
221 | + } |
|
222 | 222 | |
223 | - public function add() { |
|
224 | - $caption = clean($_REQUEST["caption"]); |
|
225 | - $output = clean($_REQUEST["output"]); |
|
223 | + public function add() { |
|
224 | + $caption = clean($_REQUEST["caption"]); |
|
225 | + $output = clean($_REQUEST["output"]); |
|
226 | 226 | |
227 | - if ($caption) { |
|
227 | + if ($caption) { |
|
228 | 228 | |
229 | - if (Labels::create($caption)) { |
|
230 | - if (!$output) { |
|
231 | - print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption)); |
|
232 | - } |
|
233 | - } |
|
229 | + if (Labels::create($caption)) { |
|
230 | + if (!$output) { |
|
231 | + print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption)); |
|
232 | + } |
|
233 | + } |
|
234 | 234 | |
235 | - if ($output == "select") { |
|
236 | - header("Content-Type: text/xml"); |
|
235 | + if ($output == "select") { |
|
236 | + header("Content-Type: text/xml"); |
|
237 | 237 | |
238 | - print "<rpc-reply><payload>"; |
|
238 | + print "<rpc-reply><payload>"; |
|
239 | 239 | |
240 | - print_label_select("select_label", |
|
241 | - $caption, ""); |
|
240 | + print_label_select("select_label", |
|
241 | + $caption, ""); |
|
242 | 242 | |
243 | - print "</payload></rpc-reply>"; |
|
244 | - } |
|
245 | - } |
|
243 | + print "</payload></rpc-reply>"; |
|
244 | + } |
|
245 | + } |
|
246 | 246 | |
247 | - return; |
|
248 | - } |
|
247 | + return; |
|
248 | + } |
|
249 | 249 | |
250 | - public function index() { |
|
250 | + public function index() { |
|
251 | 251 | |
252 | - print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; |
|
253 | - print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; |
|
254 | - print "<div dojoType='fox.Toolbar'>"; |
|
252 | + print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; |
|
253 | + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; |
|
254 | + print "<div dojoType='fox.Toolbar'>"; |
|
255 | 255 | |
256 | - print "<div dojoType='fox.form.DropDownButton'>". |
|
257 | - "<span>" . __('Select')."</span>"; |
|
258 | - print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
259 | - print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\" |
|
256 | + print "<div dojoType='fox.form.DropDownButton'>". |
|
257 | + "<span>" . __('Select')."</span>"; |
|
258 | + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
259 | + print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\" |
|
260 | 260 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
261 | - print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(false)\" |
|
261 | + print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(false)\" |
|
262 | 262 | dojoType=\"dijit.MenuItem\">".__('None')."</div>"; |
263 | - print "</div></div>"; |
|
263 | + print "</div></div>"; |
|
264 | 264 | |
265 | - print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">". |
|
266 | - __('Create label')."</button dojoType=\"dijit.form.Button\"> "; |
|
265 | + print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">". |
|
266 | + __('Create label')."</button dojoType=\"dijit.form.Button\"> "; |
|
267 | 267 | |
268 | - print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">". |
|
269 | - __('Remove')."</button dojoType=\"dijit.form.Button\"> "; |
|
268 | + print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">". |
|
269 | + __('Remove')."</button dojoType=\"dijit.form.Button\"> "; |
|
270 | 270 | |
271 | - print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">". |
|
272 | - __('Clear colors')."</button dojoType=\"dijit.form.Button\">"; |
|
271 | + print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">". |
|
272 | + __('Clear colors')."</button dojoType=\"dijit.form.Button\">"; |
|
273 | 273 | |
274 | 274 | |
275 | - print "</div>"; #toolbar |
|
276 | - print "</div>"; #pane |
|
277 | - print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; |
|
275 | + print "</div>"; #toolbar |
|
276 | + print "</div>"; #pane |
|
277 | + print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; |
|
278 | 278 | |
279 | - print "<div id=\"labellistLoading\"> |
|
279 | + print "<div id=\"labellistLoading\"> |
|
280 | 280 | <img src='images/indicator_tiny.gif'>". |
281 | - __("Loading, please wait...")."</div>"; |
|
281 | + __("Loading, please wait...")."</div>"; |
|
282 | 282 | |
283 | - print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"labelStore\" |
|
283 | + print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"labelStore\" |
|
284 | 284 | url=\"backend.php?op=pref-labels&method=getlabeltree\"> |
285 | 285 | </div> |
286 | 286 | <div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"labelModel\" store=\"labelStore\" |
@@ -302,12 +302,12 @@ discard block |
||
302 | 302 | </script> |
303 | 303 | </div>"; |
304 | 304 | |
305 | - print "</div>"; #pane |
|
305 | + print "</div>"; #pane |
|
306 | 306 | |
307 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
308 | - "hook_prefs_tab", "prefLabels"); |
|
307 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
308 | + "hook_prefs_tab", "prefLabels"); |
|
309 | 309 | |
310 | - print "</div>"; #container |
|
310 | + print "</div>"; #container |
|
311 | 311 | |
312 | - } |
|
312 | + } |
|
313 | 313 | } |
@@ -1066,70 +1066,70 @@ |
||
1066 | 1066 | $qpart = ""; |
1067 | 1067 | |
1068 | 1068 | switch ($k) { |
1069 | - case "title": |
|
1070 | - $qpart = "title = " . $this->pdo->quote($feed_title); |
|
1071 | - break; |
|
1072 | - |
|
1073 | - case "feed_url": |
|
1074 | - $qpart = "feed_url = " . $this->pdo->quote($feed_url); |
|
1075 | - break; |
|
1076 | - |
|
1077 | - case "update_interval": |
|
1078 | - $qpart = "update_interval = " . $this->pdo->quote($upd_intl); |
|
1079 | - break; |
|
1080 | - |
|
1081 | - case "purge_interval": |
|
1082 | - $qpart = "purge_interval =" . $this->pdo->quote($purge_intl); |
|
1083 | - break; |
|
1084 | - |
|
1085 | - case "auth_login": |
|
1086 | - $qpart = "auth_login = " . $this->pdo->quote($auth_login); |
|
1087 | - break; |
|
1088 | - |
|
1089 | - case "auth_pass": |
|
1090 | - $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false"; |
|
1091 | - break; |
|
1092 | - |
|
1093 | - case "private": |
|
1094 | - $qpart = "private = " . $this->pdo->quote($private); |
|
1095 | - break; |
|
1096 | - |
|
1097 | - case "include_in_digest": |
|
1098 | - $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest); |
|
1099 | - break; |
|
1100 | - |
|
1101 | - case "always_display_enclosures": |
|
1102 | - $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures); |
|
1103 | - break; |
|
1104 | - |
|
1105 | - case "mark_unread_on_update": |
|
1106 | - $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update); |
|
1107 | - break; |
|
1108 | - |
|
1109 | - case "cache_images": |
|
1110 | - $qpart = "cache_images = " . $this->pdo->quote($cache_images); |
|
1111 | - break; |
|
1112 | - |
|
1113 | - case "hide_images": |
|
1114 | - $qpart = "hide_images = " . $this->pdo->quote($hide_images); |
|
1115 | - break; |
|
1116 | - |
|
1117 | - case "cat_id": |
|
1118 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
1119 | - if ($cat_id) { |
|
1120 | - $qpart = "cat_id = " . $this->pdo->quote($cat_id); |
|
1121 | - } else { |
|
1122 | - $qpart = 'cat_id = NULL'; |
|
1123 | - } |
|
1069 | + case "title": |
|
1070 | + $qpart = "title = " . $this->pdo->quote($feed_title); |
|
1071 | + break; |
|
1072 | + |
|
1073 | + case "feed_url": |
|
1074 | + $qpart = "feed_url = " . $this->pdo->quote($feed_url); |
|
1075 | + break; |
|
1076 | + |
|
1077 | + case "update_interval": |
|
1078 | + $qpart = "update_interval = " . $this->pdo->quote($upd_intl); |
|
1079 | + break; |
|
1080 | + |
|
1081 | + case "purge_interval": |
|
1082 | + $qpart = "purge_interval =" . $this->pdo->quote($purge_intl); |
|
1083 | + break; |
|
1084 | + |
|
1085 | + case "auth_login": |
|
1086 | + $qpart = "auth_login = " . $this->pdo->quote($auth_login); |
|
1087 | + break; |
|
1088 | + |
|
1089 | + case "auth_pass": |
|
1090 | + $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false"; |
|
1091 | + break; |
|
1092 | + |
|
1093 | + case "private": |
|
1094 | + $qpart = "private = " . $this->pdo->quote($private); |
|
1095 | + break; |
|
1096 | + |
|
1097 | + case "include_in_digest": |
|
1098 | + $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest); |
|
1099 | + break; |
|
1100 | + |
|
1101 | + case "always_display_enclosures": |
|
1102 | + $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures); |
|
1103 | + break; |
|
1104 | + |
|
1105 | + case "mark_unread_on_update": |
|
1106 | + $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update); |
|
1107 | + break; |
|
1108 | + |
|
1109 | + case "cache_images": |
|
1110 | + $qpart = "cache_images = " . $this->pdo->quote($cache_images); |
|
1111 | + break; |
|
1112 | + |
|
1113 | + case "hide_images": |
|
1114 | + $qpart = "hide_images = " . $this->pdo->quote($hide_images); |
|
1115 | + break; |
|
1116 | + |
|
1117 | + case "cat_id": |
|
1118 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
1119 | + if ($cat_id) { |
|
1120 | + $qpart = "cat_id = " . $this->pdo->quote($cat_id); |
|
1124 | 1121 | } else { |
1125 | - $qpart = ""; |
|
1122 | + $qpart = 'cat_id = NULL'; |
|
1126 | 1123 | } |
1124 | + } else { |
|
1125 | + $qpart = ""; |
|
1126 | + } |
|
1127 | 1127 | |
1128 | - break; |
|
1128 | + break; |
|
1129 | 1129 | |
1130 | - case "feed_language": |
|
1131 | - $qpart = "feed_language = " . $this->pdo->quote($feed_language); |
|
1132 | - break; |
|
1130 | + case "feed_language": |
|
1131 | + $qpart = "feed_language = " . $this->pdo->quote($feed_language); |
|
1132 | + break; |
|
1133 | 1133 | |
1134 | 1134 | } |
1135 | 1135 |
@@ -42,10 +42,11 @@ discard block |
||
42 | 42 | |
43 | 43 | private function get_category_items($cat_id) { |
44 | 44 | |
45 | - if (clean($_REQUEST['mode']) != 2) |
|
46 | - $search = $_SESSION["prefs_feed_search"]; |
|
47 | - else |
|
48 | - $search = ""; |
|
45 | + if (clean($_REQUEST['mode']) != 2) { |
|
46 | + $search = $_SESSION["prefs_feed_search"]; |
|
47 | + } else { |
|
48 | + $search = ""; |
|
49 | + } |
|
49 | 50 | |
50 | 51 | // first one is set by API |
51 | 52 | $show_empty_cats = clean($_REQUEST['force_show_empty']) || |
@@ -76,8 +77,9 @@ discard block |
||
76 | 77 | $num_children = $this->calculate_children_count($cat); |
77 | 78 | $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
78 | 79 | |
79 | - if ($num_children > 0 || $show_empty_cats) |
|
80 | - array_push($items, $cat); |
|
80 | + if ($num_children > 0 || $show_empty_cats) { |
|
81 | + array_push($items, $cat); |
|
82 | + } |
|
81 | 83 | |
82 | 84 | } |
83 | 85 | |
@@ -117,10 +119,11 @@ discard block |
||
117 | 119 | |
118 | 120 | public function makefeedtree() { |
119 | 121 | |
120 | - if (clean($_REQUEST['mode']) != 2) |
|
121 | - $search = $_SESSION["prefs_feed_search"]; |
|
122 | - else |
|
123 | - $search = ""; |
|
122 | + if (clean($_REQUEST['mode']) != 2) { |
|
123 | + $search = $_SESSION["prefs_feed_search"]; |
|
124 | + } else { |
|
125 | + $search = ""; |
|
126 | + } |
|
124 | 127 | |
125 | 128 | $root = array(); |
126 | 129 | $root['id'] = 'root'; |
@@ -231,8 +234,9 @@ discard block |
||
231 | 234 | $num_children = $this->calculate_children_count($cat); |
232 | 235 | $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
233 | 236 | |
234 | - if ($num_children > 0 || $show_empty_cats) |
|
235 | - array_push($root['items'], $cat); |
|
237 | + if ($num_children > 0 || $show_empty_cats) { |
|
238 | + array_push($root['items'], $cat); |
|
239 | + } |
|
236 | 240 | |
237 | 241 | $root['param'] += count($cat['items']); |
238 | 242 | } |
@@ -279,8 +283,9 @@ discard block |
||
279 | 283 | |
280 | 284 | $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items'])); |
281 | 285 | |
282 | - if (count($cat['items']) > 0 || $show_empty_cats) |
|
283 | - array_push($root['items'], $cat); |
|
286 | + if (count($cat['items']) > 0 || $show_empty_cats) { |
|
287 | + array_push($root['items'], $cat); |
|
288 | + } |
|
284 | 289 | |
285 | 290 | $num_children = $this->calculate_children_count($root); |
286 | 291 | $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
@@ -343,8 +348,9 @@ discard block |
||
343 | 348 | private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) { |
344 | 349 | |
345 | 350 | $prefix = ""; |
346 | - for ($i = 0; $i < $nest_level; $i++) |
|
347 | - $prefix .= " "; |
|
351 | + for ($i = 0; $i < $nest_level; $i++) { |
|
352 | + $prefix .= " "; |
|
353 | + } |
|
348 | 354 | |
349 | 355 | Debug::log("$prefix C: $item_id P: $parent_id"); |
350 | 356 | |
@@ -409,8 +415,9 @@ discard block |
||
409 | 415 | #file_put_contents("/tmp/saveorder.json", clean($_POST['payload'])); |
410 | 416 | #$data = json_decode(file_get_contents("/tmp/saveorder.json"), true); |
411 | 417 | |
412 | - if (!is_array($data['items'])) |
|
413 | - $data['items'] = json_decode($data['items'], true); |
|
418 | + if (!is_array($data['items'])) { |
|
419 | + $data['items'] = json_decode($data['items'], true); |
|
420 | + } |
|
414 | 421 | |
415 | 422 | # print_r($data['items']); |
416 | 423 | |
@@ -494,7 +501,9 @@ discard block |
||
494 | 501 | } |
495 | 502 | } |
496 | 503 | |
497 | - if (is_file($icon_file)) @unlink($icon_file); |
|
504 | + if (is_file($icon_file)) { |
|
505 | + @unlink($icon_file); |
|
506 | + } |
|
498 | 507 | |
499 | 508 | print $rc; |
500 | 509 | return; |
@@ -590,8 +599,9 @@ discard block |
||
590 | 599 | if (DB_TYPE == "pgsql") { |
591 | 600 | $feed_language = $row["feed_language"]; |
592 | 601 | |
593 | - if (!$feed_language) |
|
594 | - $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE'); |
|
602 | + if (!$feed_language) { |
|
603 | + $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE'); |
|
604 | + } |
|
595 | 605 | |
596 | 606 | print "<fieldset>"; |
597 | 607 | |
@@ -1404,11 +1414,13 @@ discard block |
||
1404 | 1414 | $obj = array(); |
1405 | 1415 | $feed_id = (int) $feed_id; |
1406 | 1416 | |
1407 | - if (!$title) |
|
1408 | - $title = Feeds::getFeedTitle($feed_id, false); |
|
1417 | + if (!$title) { |
|
1418 | + $title = Feeds::getFeedTitle($feed_id, false); |
|
1419 | + } |
|
1409 | 1420 | |
1410 | - if ($unread === false) |
|
1411 | - $unread = getFeedUnread($feed_id, false); |
|
1421 | + if ($unread === false) { |
|
1422 | + $unread = getFeedUnread($feed_id, false); |
|
1423 | + } |
|
1412 | 1424 | |
1413 | 1425 | $obj['id'] = 'FEED:' . $feed_id; |
1414 | 1426 | $obj['name'] = $title; |
@@ -1738,7 +1750,9 @@ discard block |
||
1738 | 1750 | |
1739 | 1751 | |
1740 | 1752 | private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) { |
1741 | - if (!$owner_uid) $owner_uid = $_SESSION["uid"]; |
|
1753 | + if (!$owner_uid) { |
|
1754 | + $owner_uid = $_SESSION["uid"]; |
|
1755 | + } |
|
1742 | 1756 | |
1743 | 1757 | // clear old value and generate new one |
1744 | 1758 | $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys |
@@ -1,87 +1,87 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | class Pref_Feeds extends Handler_Protected { |
3 | - public function csrf_ignore($method) { |
|
4 | - $csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed", |
|
5 | - "savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds", |
|
6 | - "batchsubscribe"); |
|
3 | + public function csrf_ignore($method) { |
|
4 | + $csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed", |
|
5 | + "savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds", |
|
6 | + "batchsubscribe"); |
|
7 | 7 | |
8 | - return array_search($method, $csrf_ignored) !== false; |
|
9 | - } |
|
8 | + return array_search($method, $csrf_ignored) !== false; |
|
9 | + } |
|
10 | 10 | |
11 | - public static function get_ts_languages() { |
|
12 | - $rv = []; |
|
11 | + public static function get_ts_languages() { |
|
12 | + $rv = []; |
|
13 | 13 | |
14 | - if (DB_TYPE == "pgsql") { |
|
15 | - $dbh = Db::pdo(); |
|
14 | + if (DB_TYPE == "pgsql") { |
|
15 | + $dbh = Db::pdo(); |
|
16 | 16 | |
17 | - $res = $dbh->query("SELECT cfgname FROM pg_ts_config"); |
|
17 | + $res = $dbh->query("SELECT cfgname FROM pg_ts_config"); |
|
18 | 18 | |
19 | - while ($row = $res->fetch()) { |
|
20 | - array_push($rv, ucfirst($row['cfgname'])); |
|
21 | - } |
|
22 | - } |
|
19 | + while ($row = $res->fetch()) { |
|
20 | + array_push($rv, ucfirst($row['cfgname'])); |
|
21 | + } |
|
22 | + } |
|
23 | 23 | |
24 | - return $rv; |
|
25 | - } |
|
24 | + return $rv; |
|
25 | + } |
|
26 | 26 | |
27 | - public function batch_edit_cbox($elem, $label = false) { |
|
28 | - print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\" |
|
27 | + public function batch_edit_cbox($elem, $label = false) { |
|
28 | + print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\" |
|
29 | 29 | onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">"; |
30 | - } |
|
30 | + } |
|
31 | 31 | |
32 | - public function renamecat() { |
|
33 | - $title = clean($_REQUEST['title']); |
|
34 | - $id = clean($_REQUEST['id']); |
|
32 | + public function renamecat() { |
|
33 | + $title = clean($_REQUEST['title']); |
|
34 | + $id = clean($_REQUEST['id']); |
|
35 | 35 | |
36 | - if ($title) { |
|
37 | - $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET |
|
36 | + if ($title) { |
|
37 | + $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET |
|
38 | 38 | title = ? WHERE id = ? AND owner_uid = ?"); |
39 | - $sth->execute([$title, $id, $_SESSION['uid']]); |
|
40 | - } |
|
41 | - } |
|
39 | + $sth->execute([$title, $id, $_SESSION['uid']]); |
|
40 | + } |
|
41 | + } |
|
42 | 42 | |
43 | - private function get_category_items($cat_id) { |
|
43 | + private function get_category_items($cat_id) { |
|
44 | 44 | |
45 | - if (clean($_REQUEST['mode']) != 2) |
|
46 | - $search = $_SESSION["prefs_feed_search"]; |
|
47 | - else |
|
48 | - $search = ""; |
|
45 | + if (clean($_REQUEST['mode']) != 2) |
|
46 | + $search = $_SESSION["prefs_feed_search"]; |
|
47 | + else |
|
48 | + $search = ""; |
|
49 | 49 | |
50 | - // first one is set by API |
|
51 | - $show_empty_cats = clean($_REQUEST['force_show_empty']) || |
|
52 | - (clean($_REQUEST['mode']) != 2 && !$search); |
|
50 | + // first one is set by API |
|
51 | + $show_empty_cats = clean($_REQUEST['force_show_empty']) || |
|
52 | + (clean($_REQUEST['mode']) != 2 && !$search); |
|
53 | 53 | |
54 | - $items = array(); |
|
54 | + $items = array(); |
|
55 | 55 | |
56 | - $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories |
|
56 | + $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories |
|
57 | 57 | WHERE owner_uid = ? AND parent_cat = ? ORDER BY order_id, title"); |
58 | - $sth->execute([$_SESSION['uid'], $cat_id]); |
|
58 | + $sth->execute([$_SESSION['uid'], $cat_id]); |
|
59 | 59 | |
60 | - while ($line = $sth->fetch()) { |
|
60 | + while ($line = $sth->fetch()) { |
|
61 | 61 | |
62 | - $cat = array(); |
|
63 | - $cat['id'] = 'CAT:' . $line['id']; |
|
64 | - $cat['bare_id'] = (int)$line['id']; |
|
65 | - $cat['name'] = $line['title']; |
|
66 | - $cat['items'] = array(); |
|
67 | - $cat['checkbox'] = false; |
|
68 | - $cat['type'] = 'category'; |
|
69 | - $cat['unread'] = -1; |
|
70 | - $cat['child_unread'] = -1; |
|
71 | - $cat['auxcounter'] = -1; |
|
72 | - $cat['parent_id'] = $cat_id; |
|
62 | + $cat = array(); |
|
63 | + $cat['id'] = 'CAT:' . $line['id']; |
|
64 | + $cat['bare_id'] = (int)$line['id']; |
|
65 | + $cat['name'] = $line['title']; |
|
66 | + $cat['items'] = array(); |
|
67 | + $cat['checkbox'] = false; |
|
68 | + $cat['type'] = 'category'; |
|
69 | + $cat['unread'] = -1; |
|
70 | + $cat['child_unread'] = -1; |
|
71 | + $cat['auxcounter'] = -1; |
|
72 | + $cat['parent_id'] = $cat_id; |
|
73 | 73 | |
74 | - $cat['items'] = $this->get_category_items($line['id']); |
|
74 | + $cat['items'] = $this->get_category_items($line['id']); |
|
75 | 75 | |
76 | - $num_children = $this->calculate_children_count($cat); |
|
77 | - $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
|
76 | + $num_children = $this->calculate_children_count($cat); |
|
77 | + $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
|
78 | 78 | |
79 | - if ($num_children > 0 || $show_empty_cats) |
|
80 | - array_push($items, $cat); |
|
79 | + if ($num_children > 0 || $show_empty_cats) |
|
80 | + array_push($items, $cat); |
|
81 | 81 | |
82 | - } |
|
82 | + } |
|
83 | 83 | |
84 | - $fsth = $this->pdo->prepare("SELECT id, title, last_error, |
|
84 | + $fsth = $this->pdo->prepare("SELECT id, title, last_error, |
|
85 | 85 | ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval |
86 | 86 | FROM ttrss_feeds |
87 | 87 | WHERE cat_id = :cat AND |
@@ -89,679 +89,679 @@ discard block |
||
89 | 89 | (:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search)) |
90 | 90 | ORDER BY order_id, title"); |
91 | 91 | |
92 | - $fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]); |
|
93 | - |
|
94 | - while ($feed_line = $fsth->fetch()) { |
|
95 | - $feed = array(); |
|
96 | - $feed['id'] = 'FEED:' . $feed_line['id']; |
|
97 | - $feed['bare_id'] = (int)$feed_line['id']; |
|
98 | - $feed['auxcounter'] = -1; |
|
99 | - $feed['name'] = $feed_line['title']; |
|
100 | - $feed['checkbox'] = false; |
|
101 | - $feed['unread'] = -1; |
|
102 | - $feed['error'] = $feed_line['last_error']; |
|
103 | - $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
|
104 | - $feed['param'] = make_local_datetime( |
|
105 | - $feed_line['last_updated'], true); |
|
106 | - $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
107 | - |
|
108 | - array_push($items, $feed); |
|
109 | - } |
|
110 | - |
|
111 | - return $items; |
|
112 | - } |
|
113 | - |
|
114 | - public function getfeedtree() { |
|
115 | - print json_encode($this->makefeedtree()); |
|
116 | - } |
|
117 | - |
|
118 | - public function makefeedtree() { |
|
119 | - |
|
120 | - if (clean($_REQUEST['mode']) != 2) |
|
121 | - $search = $_SESSION["prefs_feed_search"]; |
|
122 | - else |
|
123 | - $search = ""; |
|
124 | - |
|
125 | - $root = array(); |
|
126 | - $root['id'] = 'root'; |
|
127 | - $root['name'] = __('Feeds'); |
|
128 | - $root['items'] = array(); |
|
129 | - $root['type'] = 'category'; |
|
130 | - |
|
131 | - $enable_cats = get_pref('ENABLE_FEED_CATS'); |
|
132 | - |
|
133 | - if (clean($_REQUEST['mode']) == 2) { |
|
134 | - |
|
135 | - if ($enable_cats) { |
|
136 | - $cat = $this->feedlist_init_cat(-1); |
|
137 | - } else { |
|
138 | - $cat['items'] = array(); |
|
139 | - } |
|
140 | - |
|
141 | - foreach (array(-4, -3, -1, -2, 0, -6) as $i) { |
|
142 | - array_push($cat['items'], $this->feedlist_init_feed($i)); |
|
143 | - } |
|
144 | - |
|
145 | - /* Plugin feeds for -1 */ |
|
146 | - |
|
147 | - $feeds = PluginHost::getInstance()->get_feeds(-1); |
|
148 | - |
|
149 | - if ($feeds) { |
|
150 | - foreach ($feeds as $feed) { |
|
151 | - $feed_id = PluginHost::pfeed_to_feed_id($feed['id']); |
|
152 | - |
|
153 | - $item = array(); |
|
154 | - $item['id'] = 'FEED:' . $feed_id; |
|
155 | - $item['bare_id'] = (int)$feed_id; |
|
156 | - $item['auxcounter'] = -1; |
|
157 | - $item['name'] = $feed['title']; |
|
158 | - $item['checkbox'] = false; |
|
159 | - $item['error'] = ''; |
|
160 | - $item['icon'] = $feed['icon']; |
|
161 | - |
|
162 | - $item['param'] = ''; |
|
163 | - $item['unread'] = -1; |
|
164 | - $item['type'] = 'feed'; |
|
165 | - |
|
166 | - array_push($cat['items'], $item); |
|
167 | - } |
|
168 | - } |
|
169 | - |
|
170 | - if ($enable_cats) { |
|
171 | - array_push($root['items'], $cat); |
|
172 | - } else { |
|
173 | - $root['items'] = array_merge($root['items'], $cat['items']); |
|
174 | - } |
|
175 | - |
|
176 | - $sth = $this->pdo->prepare("SELECT * FROM |
|
92 | + $fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]); |
|
93 | + |
|
94 | + while ($feed_line = $fsth->fetch()) { |
|
95 | + $feed = array(); |
|
96 | + $feed['id'] = 'FEED:' . $feed_line['id']; |
|
97 | + $feed['bare_id'] = (int)$feed_line['id']; |
|
98 | + $feed['auxcounter'] = -1; |
|
99 | + $feed['name'] = $feed_line['title']; |
|
100 | + $feed['checkbox'] = false; |
|
101 | + $feed['unread'] = -1; |
|
102 | + $feed['error'] = $feed_line['last_error']; |
|
103 | + $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
|
104 | + $feed['param'] = make_local_datetime( |
|
105 | + $feed_line['last_updated'], true); |
|
106 | + $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
107 | + |
|
108 | + array_push($items, $feed); |
|
109 | + } |
|
110 | + |
|
111 | + return $items; |
|
112 | + } |
|
113 | + |
|
114 | + public function getfeedtree() { |
|
115 | + print json_encode($this->makefeedtree()); |
|
116 | + } |
|
117 | + |
|
118 | + public function makefeedtree() { |
|
119 | + |
|
120 | + if (clean($_REQUEST['mode']) != 2) |
|
121 | + $search = $_SESSION["prefs_feed_search"]; |
|
122 | + else |
|
123 | + $search = ""; |
|
124 | + |
|
125 | + $root = array(); |
|
126 | + $root['id'] = 'root'; |
|
127 | + $root['name'] = __('Feeds'); |
|
128 | + $root['items'] = array(); |
|
129 | + $root['type'] = 'category'; |
|
130 | + |
|
131 | + $enable_cats = get_pref('ENABLE_FEED_CATS'); |
|
132 | + |
|
133 | + if (clean($_REQUEST['mode']) == 2) { |
|
134 | + |
|
135 | + if ($enable_cats) { |
|
136 | + $cat = $this->feedlist_init_cat(-1); |
|
137 | + } else { |
|
138 | + $cat['items'] = array(); |
|
139 | + } |
|
140 | + |
|
141 | + foreach (array(-4, -3, -1, -2, 0, -6) as $i) { |
|
142 | + array_push($cat['items'], $this->feedlist_init_feed($i)); |
|
143 | + } |
|
144 | + |
|
145 | + /* Plugin feeds for -1 */ |
|
146 | + |
|
147 | + $feeds = PluginHost::getInstance()->get_feeds(-1); |
|
148 | + |
|
149 | + if ($feeds) { |
|
150 | + foreach ($feeds as $feed) { |
|
151 | + $feed_id = PluginHost::pfeed_to_feed_id($feed['id']); |
|
152 | + |
|
153 | + $item = array(); |
|
154 | + $item['id'] = 'FEED:' . $feed_id; |
|
155 | + $item['bare_id'] = (int)$feed_id; |
|
156 | + $item['auxcounter'] = -1; |
|
157 | + $item['name'] = $feed['title']; |
|
158 | + $item['checkbox'] = false; |
|
159 | + $item['error'] = ''; |
|
160 | + $item['icon'] = $feed['icon']; |
|
161 | + |
|
162 | + $item['param'] = ''; |
|
163 | + $item['unread'] = -1; |
|
164 | + $item['type'] = 'feed'; |
|
165 | + |
|
166 | + array_push($cat['items'], $item); |
|
167 | + } |
|
168 | + } |
|
169 | + |
|
170 | + if ($enable_cats) { |
|
171 | + array_push($root['items'], $cat); |
|
172 | + } else { |
|
173 | + $root['items'] = array_merge($root['items'], $cat['items']); |
|
174 | + } |
|
175 | + |
|
176 | + $sth = $this->pdo->prepare("SELECT * FROM |
|
177 | 177 | ttrss_labels2 WHERE owner_uid = ? ORDER by caption"); |
178 | - $sth->execute([$_SESSION['uid']]); |
|
178 | + $sth->execute([$_SESSION['uid']]); |
|
179 | 179 | |
180 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
181 | - $cat = $this->feedlist_init_cat(-2); |
|
182 | - } else { |
|
183 | - $cat['items'] = array(); |
|
184 | - } |
|
180 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
181 | + $cat = $this->feedlist_init_cat(-2); |
|
182 | + } else { |
|
183 | + $cat['items'] = array(); |
|
184 | + } |
|
185 | 185 | |
186 | - $num_labels = 0; |
|
187 | - while ($line = $sth->fetch()) { |
|
188 | - ++$num_labels; |
|
186 | + $num_labels = 0; |
|
187 | + while ($line = $sth->fetch()) { |
|
188 | + ++$num_labels; |
|
189 | 189 | |
190 | - $label_id = Labels::label_to_feed_id($line['id']); |
|
190 | + $label_id = Labels::label_to_feed_id($line['id']); |
|
191 | 191 | |
192 | - $feed = $this->feedlist_init_feed($label_id, false, 0); |
|
192 | + $feed = $this->feedlist_init_feed($label_id, false, 0); |
|
193 | 193 | |
194 | - $feed['fg_color'] = $line['fg_color']; |
|
195 | - $feed['bg_color'] = $line['bg_color']; |
|
194 | + $feed['fg_color'] = $line['fg_color']; |
|
195 | + $feed['bg_color'] = $line['bg_color']; |
|
196 | 196 | |
197 | - array_push($cat['items'], $feed); |
|
198 | - } |
|
197 | + array_push($cat['items'], $feed); |
|
198 | + } |
|
199 | 199 | |
200 | - if ($num_labels) { |
|
201 | - if ($enable_cats) { |
|
202 | - array_push($root['items'], $cat); |
|
203 | - } else { |
|
204 | - $root['items'] = array_merge($root['items'], $cat['items']); |
|
205 | - } |
|
206 | - } |
|
207 | - } |
|
200 | + if ($num_labels) { |
|
201 | + if ($enable_cats) { |
|
202 | + array_push($root['items'], $cat); |
|
203 | + } else { |
|
204 | + $root['items'] = array_merge($root['items'], $cat['items']); |
|
205 | + } |
|
206 | + } |
|
207 | + } |
|
208 | 208 | |
209 | - if ($enable_cats) { |
|
210 | - $show_empty_cats = clean($_REQUEST['force_show_empty']) || |
|
211 | - (clean($_REQUEST['mode']) != 2 && !$search); |
|
209 | + if ($enable_cats) { |
|
210 | + $show_empty_cats = clean($_REQUEST['force_show_empty']) || |
|
211 | + (clean($_REQUEST['mode']) != 2 && !$search); |
|
212 | 212 | |
213 | - $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories |
|
213 | + $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories |
|
214 | 214 | WHERE owner_uid = ? AND parent_cat IS NULL ORDER BY order_id, title"); |
215 | - $sth->execute([$_SESSION['uid']]); |
|
216 | - |
|
217 | - while ($line = $sth->fetch()) { |
|
218 | - $cat = array(); |
|
219 | - $cat['id'] = 'CAT:' . $line['id']; |
|
220 | - $cat['bare_id'] = (int)$line['id']; |
|
221 | - $cat['auxcounter'] = -1; |
|
222 | - $cat['name'] = $line['title']; |
|
223 | - $cat['items'] = array(); |
|
224 | - $cat['checkbox'] = false; |
|
225 | - $cat['type'] = 'category'; |
|
226 | - $cat['unread'] = -1; |
|
227 | - $cat['child_unread'] = -1; |
|
228 | - |
|
229 | - $cat['items'] = $this->get_category_items($line['id']); |
|
230 | - |
|
231 | - $num_children = $this->calculate_children_count($cat); |
|
232 | - $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
|
233 | - |
|
234 | - if ($num_children > 0 || $show_empty_cats) |
|
235 | - array_push($root['items'], $cat); |
|
236 | - |
|
237 | - $root['param'] += count($cat['items']); |
|
238 | - } |
|
239 | - |
|
240 | - /* Uncategorized is a special case */ |
|
241 | - |
|
242 | - $cat = array(); |
|
243 | - $cat['id'] = 'CAT:0'; |
|
244 | - $cat['bare_id'] = 0; |
|
245 | - $cat['auxcounter'] = -1; |
|
246 | - $cat['name'] = __("Uncategorized"); |
|
247 | - $cat['items'] = array(); |
|
248 | - $cat['type'] = 'category'; |
|
249 | - $cat['checkbox'] = false; |
|
250 | - $cat['unread'] = -1; |
|
251 | - $cat['child_unread'] = -1; |
|
252 | - |
|
253 | - $fsth = $this->pdo->prepare("SELECT id, title,last_error, |
|
215 | + $sth->execute([$_SESSION['uid']]); |
|
216 | + |
|
217 | + while ($line = $sth->fetch()) { |
|
218 | + $cat = array(); |
|
219 | + $cat['id'] = 'CAT:' . $line['id']; |
|
220 | + $cat['bare_id'] = (int)$line['id']; |
|
221 | + $cat['auxcounter'] = -1; |
|
222 | + $cat['name'] = $line['title']; |
|
223 | + $cat['items'] = array(); |
|
224 | + $cat['checkbox'] = false; |
|
225 | + $cat['type'] = 'category'; |
|
226 | + $cat['unread'] = -1; |
|
227 | + $cat['child_unread'] = -1; |
|
228 | + |
|
229 | + $cat['items'] = $this->get_category_items($line['id']); |
|
230 | + |
|
231 | + $num_children = $this->calculate_children_count($cat); |
|
232 | + $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
|
233 | + |
|
234 | + if ($num_children > 0 || $show_empty_cats) |
|
235 | + array_push($root['items'], $cat); |
|
236 | + |
|
237 | + $root['param'] += count($cat['items']); |
|
238 | + } |
|
239 | + |
|
240 | + /* Uncategorized is a special case */ |
|
241 | + |
|
242 | + $cat = array(); |
|
243 | + $cat['id'] = 'CAT:0'; |
|
244 | + $cat['bare_id'] = 0; |
|
245 | + $cat['auxcounter'] = -1; |
|
246 | + $cat['name'] = __("Uncategorized"); |
|
247 | + $cat['items'] = array(); |
|
248 | + $cat['type'] = 'category'; |
|
249 | + $cat['checkbox'] = false; |
|
250 | + $cat['unread'] = -1; |
|
251 | + $cat['child_unread'] = -1; |
|
252 | + |
|
253 | + $fsth = $this->pdo->prepare("SELECT id, title,last_error, |
|
254 | 254 | ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval |
255 | 255 | FROM ttrss_feeds |
256 | 256 | WHERE cat_id IS NULL AND |
257 | 257 | owner_uid = :uid AND |
258 | 258 | (:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search)) |
259 | 259 | ORDER BY order_id, title"); |
260 | - $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]); |
|
261 | - |
|
262 | - while ($feed_line = $fsth->fetch()) { |
|
263 | - $feed = array(); |
|
264 | - $feed['id'] = 'FEED:' . $feed_line['id']; |
|
265 | - $feed['bare_id'] = (int)$feed_line['id']; |
|
266 | - $feed['auxcounter'] = -1; |
|
267 | - $feed['name'] = $feed_line['title']; |
|
268 | - $feed['checkbox'] = false; |
|
269 | - $feed['error'] = $feed_line['last_error']; |
|
270 | - $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
|
271 | - $feed['param'] = make_local_datetime( |
|
272 | - $feed_line['last_updated'], true); |
|
273 | - $feed['unread'] = -1; |
|
274 | - $feed['type'] = 'feed'; |
|
275 | - $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
276 | - |
|
277 | - array_push($cat['items'], $feed); |
|
278 | - } |
|
279 | - |
|
280 | - $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items'])); |
|
281 | - |
|
282 | - if (count($cat['items']) > 0 || $show_empty_cats) |
|
283 | - array_push($root['items'], $cat); |
|
284 | - |
|
285 | - $num_children = $this->calculate_children_count($root); |
|
286 | - $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
|
287 | - |
|
288 | - } else { |
|
289 | - $fsth = $this->pdo->prepare("SELECT id, title, last_error, |
|
260 | + $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]); |
|
261 | + |
|
262 | + while ($feed_line = $fsth->fetch()) { |
|
263 | + $feed = array(); |
|
264 | + $feed['id'] = 'FEED:' . $feed_line['id']; |
|
265 | + $feed['bare_id'] = (int)$feed_line['id']; |
|
266 | + $feed['auxcounter'] = -1; |
|
267 | + $feed['name'] = $feed_line['title']; |
|
268 | + $feed['checkbox'] = false; |
|
269 | + $feed['error'] = $feed_line['last_error']; |
|
270 | + $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
|
271 | + $feed['param'] = make_local_datetime( |
|
272 | + $feed_line['last_updated'], true); |
|
273 | + $feed['unread'] = -1; |
|
274 | + $feed['type'] = 'feed'; |
|
275 | + $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
276 | + |
|
277 | + array_push($cat['items'], $feed); |
|
278 | + } |
|
279 | + |
|
280 | + $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items'])); |
|
281 | + |
|
282 | + if (count($cat['items']) > 0 || $show_empty_cats) |
|
283 | + array_push($root['items'], $cat); |
|
284 | + |
|
285 | + $num_children = $this->calculate_children_count($root); |
|
286 | + $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); |
|
287 | + |
|
288 | + } else { |
|
289 | + $fsth = $this->pdo->prepare("SELECT id, title, last_error, |
|
290 | 290 | ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval |
291 | 291 | FROM ttrss_feeds |
292 | 292 | WHERE owner_uid = :uid AND |
293 | 293 | (:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search)) |
294 | 294 | ORDER BY order_id, title"); |
295 | - $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]); |
|
296 | - |
|
297 | - while ($feed_line = $fsth->fetch()) { |
|
298 | - $feed = array(); |
|
299 | - $feed['id'] = 'FEED:' . $feed_line['id']; |
|
300 | - $feed['bare_id'] = (int)$feed_line['id']; |
|
301 | - $feed['auxcounter'] = -1; |
|
302 | - $feed['name'] = $feed_line['title']; |
|
303 | - $feed['checkbox'] = false; |
|
304 | - $feed['error'] = $feed_line['last_error']; |
|
305 | - $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
|
306 | - $feed['param'] = make_local_datetime( |
|
307 | - $feed_line['last_updated'], true); |
|
308 | - $feed['unread'] = -1; |
|
309 | - $feed['type'] = 'feed'; |
|
310 | - $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
311 | - |
|
312 | - array_push($root['items'], $feed); |
|
313 | - } |
|
314 | - |
|
315 | - $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items'])); |
|
316 | - } |
|
317 | - |
|
318 | - $fl = array(); |
|
319 | - $fl['identifier'] = 'id'; |
|
320 | - $fl['label'] = 'name'; |
|
321 | - |
|
322 | - if (clean($_REQUEST['mode']) != 2) { |
|
323 | - $fl['items'] = array($root); |
|
324 | - } else { |
|
325 | - $fl['items'] = $root['items']; |
|
326 | - } |
|
327 | - |
|
328 | - return $fl; |
|
329 | - } |
|
330 | - |
|
331 | - public function catsortreset() { |
|
332 | - $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
|
295 | + $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]); |
|
296 | + |
|
297 | + while ($feed_line = $fsth->fetch()) { |
|
298 | + $feed = array(); |
|
299 | + $feed['id'] = 'FEED:' . $feed_line['id']; |
|
300 | + $feed['bare_id'] = (int)$feed_line['id']; |
|
301 | + $feed['auxcounter'] = -1; |
|
302 | + $feed['name'] = $feed_line['title']; |
|
303 | + $feed['checkbox'] = false; |
|
304 | + $feed['error'] = $feed_line['last_error']; |
|
305 | + $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
|
306 | + $feed['param'] = make_local_datetime( |
|
307 | + $feed_line['last_updated'], true); |
|
308 | + $feed['unread'] = -1; |
|
309 | + $feed['type'] = 'feed'; |
|
310 | + $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
311 | + |
|
312 | + array_push($root['items'], $feed); |
|
313 | + } |
|
314 | + |
|
315 | + $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items'])); |
|
316 | + } |
|
317 | + |
|
318 | + $fl = array(); |
|
319 | + $fl['identifier'] = 'id'; |
|
320 | + $fl['label'] = 'name'; |
|
321 | + |
|
322 | + if (clean($_REQUEST['mode']) != 2) { |
|
323 | + $fl['items'] = array($root); |
|
324 | + } else { |
|
325 | + $fl['items'] = $root['items']; |
|
326 | + } |
|
327 | + |
|
328 | + return $fl; |
|
329 | + } |
|
330 | + |
|
331 | + public function catsortreset() { |
|
332 | + $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
|
333 | 333 | SET order_id = 0 WHERE owner_uid = ?"); |
334 | - $sth->execute([$_SESSION['uid']]); |
|
335 | - } |
|
334 | + $sth->execute([$_SESSION['uid']]); |
|
335 | + } |
|
336 | 336 | |
337 | - public function feedsortreset() { |
|
338 | - $sth = $this->pdo->prepare("UPDATE ttrss_feeds |
|
337 | + public function feedsortreset() { |
|
338 | + $sth = $this->pdo->prepare("UPDATE ttrss_feeds |
|
339 | 339 | SET order_id = 0 WHERE owner_uid = ?"); |
340 | - $sth->execute([$_SESSION['uid']]); |
|
341 | - } |
|
340 | + $sth->execute([$_SESSION['uid']]); |
|
341 | + } |
|
342 | 342 | |
343 | - private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) { |
|
343 | + private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) { |
|
344 | 344 | |
345 | - $prefix = ""; |
|
346 | - for ($i = 0; $i < $nest_level; $i++) |
|
347 | - $prefix .= " "; |
|
345 | + $prefix = ""; |
|
346 | + for ($i = 0; $i < $nest_level; $i++) |
|
347 | + $prefix .= " "; |
|
348 | 348 | |
349 | - Debug::log("$prefix C: $item_id P: $parent_id"); |
|
349 | + Debug::log("$prefix C: $item_id P: $parent_id"); |
|
350 | 350 | |
351 | - $bare_item_id = substr($item_id, strpos($item_id, ':')+1); |
|
351 | + $bare_item_id = substr($item_id, strpos($item_id, ':')+1); |
|
352 | 352 | |
353 | - if ($item_id != 'root') { |
|
354 | - if ($parent_id && $parent_id != 'root') { |
|
355 | - $parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1); |
|
356 | - $parent_qpart = $parent_bare_id; |
|
357 | - } else { |
|
358 | - $parent_qpart = null; |
|
359 | - } |
|
353 | + if ($item_id != 'root') { |
|
354 | + if ($parent_id && $parent_id != 'root') { |
|
355 | + $parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1); |
|
356 | + $parent_qpart = $parent_bare_id; |
|
357 | + } else { |
|
358 | + $parent_qpart = null; |
|
359 | + } |
|
360 | 360 | |
361 | - $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
|
361 | + $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
|
362 | 362 | SET parent_cat = ? WHERE id = ? AND |
363 | 363 | owner_uid = ?"); |
364 | - $sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]); |
|
365 | - } |
|
364 | + $sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]); |
|
365 | + } |
|
366 | 366 | |
367 | - $order_id = 1; |
|
367 | + $order_id = 1; |
|
368 | 368 | |
369 | - $cat = $data_map[$item_id]; |
|
369 | + $cat = $data_map[$item_id]; |
|
370 | 370 | |
371 | - if ($cat && is_array($cat)) { |
|
372 | - foreach ($cat as $item) { |
|
373 | - $id = $item['_reference']; |
|
374 | - $bare_id = substr($id, strpos($id, ':')+1); |
|
371 | + if ($cat && is_array($cat)) { |
|
372 | + foreach ($cat as $item) { |
|
373 | + $id = $item['_reference']; |
|
374 | + $bare_id = substr($id, strpos($id, ':')+1); |
|
375 | 375 | |
376 | - Debug::log("$prefix [$order_id] $id/$bare_id"); |
|
376 | + Debug::log("$prefix [$order_id] $id/$bare_id"); |
|
377 | 377 | |
378 | - if ($item['_reference']) { |
|
378 | + if ($item['_reference']) { |
|
379 | 379 | |
380 | - if (strpos($id, "FEED") === 0) { |
|
380 | + if (strpos($id, "FEED") === 0) { |
|
381 | 381 | |
382 | - $cat_id = ($item_id != "root") ? $bare_item_id : null; |
|
382 | + $cat_id = ($item_id != "root") ? $bare_item_id : null; |
|
383 | 383 | |
384 | - $sth = $this->pdo->prepare("UPDATE ttrss_feeds |
|
384 | + $sth = $this->pdo->prepare("UPDATE ttrss_feeds |
|
385 | 385 | SET order_id = ?, cat_id = ? |
386 | 386 | WHERE id = ? AND owner_uid = ?"); |
387 | 387 | |
388 | - $sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]); |
|
388 | + $sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]); |
|
389 | 389 | |
390 | - } else if (strpos($id, "CAT:") === 0) { |
|
391 | - $this->process_category_order($data_map, $item['_reference'], $item_id, |
|
392 | - $nest_level+1); |
|
390 | + } else if (strpos($id, "CAT:") === 0) { |
|
391 | + $this->process_category_order($data_map, $item['_reference'], $item_id, |
|
392 | + $nest_level+1); |
|
393 | 393 | |
394 | - $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
|
394 | + $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
|
395 | 395 | SET order_id = ? WHERE id = ? AND |
396 | 396 | owner_uid = ?"); |
397 | - $sth->execute([$order_id, $bare_id, $_SESSION['uid']]); |
|
398 | - } |
|
399 | - } |
|
397 | + $sth->execute([$order_id, $bare_id, $_SESSION['uid']]); |
|
398 | + } |
|
399 | + } |
|
400 | 400 | |
401 | - ++$order_id; |
|
402 | - } |
|
403 | - } |
|
404 | - } |
|
401 | + ++$order_id; |
|
402 | + } |
|
403 | + } |
|
404 | + } |
|
405 | 405 | |
406 | - public function savefeedorder() { |
|
407 | - $data = json_decode($_POST['payload'], true); |
|
406 | + public function savefeedorder() { |
|
407 | + $data = json_decode($_POST['payload'], true); |
|
408 | 408 | |
409 | - #file_put_contents("/tmp/saveorder.json", clean($_POST['payload'])); |
|
410 | - #$data = json_decode(file_get_contents("/tmp/saveorder.json"), true); |
|
409 | + #file_put_contents("/tmp/saveorder.json", clean($_POST['payload'])); |
|
410 | + #$data = json_decode(file_get_contents("/tmp/saveorder.json"), true); |
|
411 | 411 | |
412 | - if (!is_array($data['items'])) |
|
413 | - $data['items'] = json_decode($data['items'], true); |
|
412 | + if (!is_array($data['items'])) |
|
413 | + $data['items'] = json_decode($data['items'], true); |
|
414 | 414 | |
415 | 415 | # print_r($data['items']); |
416 | 416 | |
417 | - if (is_array($data) && is_array($data['items'])) { |
|
417 | + if (is_array($data) && is_array($data['items'])) { |
|
418 | 418 | # $cat_order_id = 0; |
419 | 419 | |
420 | - $data_map = array(); |
|
421 | - $root_item = false; |
|
420 | + $data_map = array(); |
|
421 | + $root_item = false; |
|
422 | 422 | |
423 | - foreach ($data['items'] as $item) { |
|
423 | + foreach ($data['items'] as $item) { |
|
424 | 424 | |
425 | 425 | # if ($item['id'] != 'root') { |
426 | - if (is_array($item['items'])) { |
|
427 | - if (isset($item['items']['_reference'])) { |
|
428 | - $data_map[$item['id']] = array($item['items']); |
|
429 | - } else { |
|
430 | - $data_map[$item['id']] = $item['items']; |
|
431 | - } |
|
432 | - } |
|
433 | - if ($item['id'] == 'root') { |
|
434 | - $root_item = $item['id']; |
|
435 | - } |
|
436 | - } |
|
437 | - |
|
438 | - $this->process_category_order($data_map, $root_item); |
|
439 | - } |
|
440 | - } |
|
441 | - |
|
442 | - public function removeicon() { |
|
443 | - $feed_id = clean($_REQUEST["feed_id"]); |
|
444 | - |
|
445 | - $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?"); |
|
446 | - $sth->execute([$feed_id, $_SESSION['uid']]); |
|
447 | - |
|
448 | - if ($sth->fetch()) { |
|
449 | - @unlink(ICONS_DIR . "/$feed_id.ico"); |
|
450 | - |
|
451 | - $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?"); |
|
452 | - $sth->execute([$feed_id]); |
|
453 | - } |
|
454 | - } |
|
455 | - |
|
456 | - public function uploadicon() { |
|
457 | - header("Content-type: text/html"); |
|
458 | - |
|
459 | - if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) { |
|
460 | - $tmp_file = tempnam(CACHE_DIR . '/upload', 'icon'); |
|
461 | - |
|
462 | - $result = move_uploaded_file($_FILES['icon_file']['tmp_name'], |
|
463 | - $tmp_file); |
|
464 | - |
|
465 | - if (!$result) { |
|
466 | - return; |
|
467 | - } |
|
468 | - } else { |
|
469 | - return; |
|
470 | - } |
|
426 | + if (is_array($item['items'])) { |
|
427 | + if (isset($item['items']['_reference'])) { |
|
428 | + $data_map[$item['id']] = array($item['items']); |
|
429 | + } else { |
|
430 | + $data_map[$item['id']] = $item['items']; |
|
431 | + } |
|
432 | + } |
|
433 | + if ($item['id'] == 'root') { |
|
434 | + $root_item = $item['id']; |
|
435 | + } |
|
436 | + } |
|
437 | + |
|
438 | + $this->process_category_order($data_map, $root_item); |
|
439 | + } |
|
440 | + } |
|
441 | + |
|
442 | + public function removeicon() { |
|
443 | + $feed_id = clean($_REQUEST["feed_id"]); |
|
444 | + |
|
445 | + $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?"); |
|
446 | + $sth->execute([$feed_id, $_SESSION['uid']]); |
|
447 | + |
|
448 | + if ($sth->fetch()) { |
|
449 | + @unlink(ICONS_DIR . "/$feed_id.ico"); |
|
450 | + |
|
451 | + $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?"); |
|
452 | + $sth->execute([$feed_id]); |
|
453 | + } |
|
454 | + } |
|
455 | + |
|
456 | + public function uploadicon() { |
|
457 | + header("Content-type: text/html"); |
|
458 | + |
|
459 | + if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) { |
|
460 | + $tmp_file = tempnam(CACHE_DIR . '/upload', 'icon'); |
|
461 | + |
|
462 | + $result = move_uploaded_file($_FILES['icon_file']['tmp_name'], |
|
463 | + $tmp_file); |
|
464 | + |
|
465 | + if (!$result) { |
|
466 | + return; |
|
467 | + } |
|
468 | + } else { |
|
469 | + return; |
|
470 | + } |
|
471 | 471 | |
472 | - $icon_file = $tmp_file; |
|
473 | - $feed_id = clean($_REQUEST["feed_id"]); |
|
474 | - $rc = 2; // failed |
|
472 | + $icon_file = $tmp_file; |
|
473 | + $feed_id = clean($_REQUEST["feed_id"]); |
|
474 | + $rc = 2; // failed |
|
475 | 475 | |
476 | - if (is_file($icon_file) && $feed_id) { |
|
477 | - if (filesize($icon_file) < 65535) { |
|
476 | + if (is_file($icon_file) && $feed_id) { |
|
477 | + if (filesize($icon_file) < 65535) { |
|
478 | 478 | |
479 | - $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?"); |
|
480 | - $sth->execute([$feed_id, $_SESSION['uid']]); |
|
479 | + $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?"); |
|
480 | + $sth->execute([$feed_id, $_SESSION['uid']]); |
|
481 | 481 | |
482 | - if ($sth->fetch()) { |
|
483 | - @unlink(ICONS_DIR . "/$feed_id.ico"); |
|
484 | - if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) { |
|
482 | + if ($sth->fetch()) { |
|
483 | + @unlink(ICONS_DIR . "/$feed_id.ico"); |
|
484 | + if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) { |
|
485 | 485 | |
486 | - $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?"); |
|
487 | - $sth->execute([$feed_id]); |
|
486 | + $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?"); |
|
487 | + $sth->execute([$feed_id]); |
|
488 | 488 | |
489 | - $rc = 0; |
|
490 | - } |
|
491 | - } |
|
492 | - } else { |
|
493 | - $rc = 1; |
|
494 | - } |
|
495 | - } |
|
489 | + $rc = 0; |
|
490 | + } |
|
491 | + } |
|
492 | + } else { |
|
493 | + $rc = 1; |
|
494 | + } |
|
495 | + } |
|
496 | 496 | |
497 | - if (is_file($icon_file)) @unlink($icon_file); |
|
497 | + if (is_file($icon_file)) @unlink($icon_file); |
|
498 | 498 | |
499 | - print $rc; |
|
500 | - return; |
|
501 | - } |
|
499 | + print $rc; |
|
500 | + return; |
|
501 | + } |
|
502 | 502 | |
503 | - public function editfeed() { |
|
504 | - global $purge_intervals; |
|
505 | - global $update_intervals; |
|
503 | + public function editfeed() { |
|
504 | + global $purge_intervals; |
|
505 | + global $update_intervals; |
|
506 | 506 | |
507 | 507 | |
508 | - $feed_id = clean($_REQUEST["id"]); |
|
508 | + $feed_id = clean($_REQUEST["id"]); |
|
509 | 509 | |
510 | - $sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND |
|
510 | + $sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND |
|
511 | 511 | owner_uid = ?"); |
512 | - $sth->execute([$feed_id, $_SESSION['uid']]); |
|
512 | + $sth->execute([$feed_id, $_SESSION['uid']]); |
|
513 | 513 | |
514 | - if ($row = $sth->fetch()) { |
|
515 | - print '<div dojoType="dijit.layout.TabContainer" style="height : 450px"> |
|
514 | + if ($row = $sth->fetch()) { |
|
515 | + print '<div dojoType="dijit.layout.TabContainer" style="height : 450px"> |
|
516 | 516 | <div dojoType="dijit.layout.ContentPane" title="'.__('General').'">'; |
517 | 517 | |
518 | - $title = htmlspecialchars($row["title"]); |
|
518 | + $title = htmlspecialchars($row["title"]); |
|
519 | 519 | |
520 | - print_hidden("id", "$feed_id"); |
|
521 | - print_hidden("op", "pref-feeds"); |
|
522 | - print_hidden("method", "editSave"); |
|
520 | + print_hidden("id", "$feed_id"); |
|
521 | + print_hidden("op", "pref-feeds"); |
|
522 | + print_hidden("method", "editSave"); |
|
523 | 523 | |
524 | - print "<header>".__("Feed")."</header>"; |
|
525 | - print "<section>"; |
|
524 | + print "<header>".__("Feed")."</header>"; |
|
525 | + print "<section>"; |
|
526 | 526 | |
527 | - /* Title */ |
|
527 | + /* Title */ |
|
528 | 528 | |
529 | - print "<fieldset>"; |
|
529 | + print "<fieldset>"; |
|
530 | 530 | |
531 | - print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
|
531 | + print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
|
532 | 532 | placeHolder=\"".__("Feed Title")."\" |
533 | 533 | style='font-size : 16px; width: 500px' name='title' value=\"$title\">"; |
534 | 534 | |
535 | - print "</fieldset>"; |
|
535 | + print "</fieldset>"; |
|
536 | 536 | |
537 | - /* Feed URL */ |
|
537 | + /* Feed URL */ |
|
538 | 538 | |
539 | - $feed_url = htmlspecialchars($row["feed_url"]); |
|
539 | + $feed_url = htmlspecialchars($row["feed_url"]); |
|
540 | 540 | |
541 | - print "<fieldset>"; |
|
541 | + print "<fieldset>"; |
|
542 | 542 | |
543 | - print "<label>" . __('URL:') . "</label> "; |
|
544 | - print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
|
543 | + print "<label>" . __('URL:') . "</label> "; |
|
544 | + print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
|
545 | 545 | placeHolder=\"".__("Feed URL")."\" |
546 | 546 | regExp='^(http|https)://.*' style='width : 300px' |
547 | 547 | name='feed_url' value=\"$feed_url\">"; |
548 | 548 | |
549 | - $last_error = $row["last_error"]; |
|
549 | + $last_error = $row["last_error"]; |
|
550 | 550 | |
551 | - if ($last_error) { |
|
552 | - print " <i class=\"material-icons\" |
|
551 | + if ($last_error) { |
|
552 | + print " <i class=\"material-icons\" |
|
553 | 553 | title=\"".htmlspecialchars($last_error)."\">error</i>"; |
554 | - } |
|
554 | + } |
|
555 | 555 | |
556 | - print "</fieldset>"; |
|
556 | + print "</fieldset>"; |
|
557 | 557 | |
558 | - /* Category */ |
|
558 | + /* Category */ |
|
559 | 559 | |
560 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
560 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
561 | 561 | |
562 | - $cat_id = $row["cat_id"]; |
|
562 | + $cat_id = $row["cat_id"]; |
|
563 | 563 | |
564 | - print "<fieldset>"; |
|
564 | + print "<fieldset>"; |
|
565 | 565 | |
566 | - print "<label>" . __('Place in category:') . "</label> "; |
|
566 | + print "<label>" . __('Place in category:') . "</label> "; |
|
567 | 567 | |
568 | - print_feed_cat_select("cat_id", $cat_id, |
|
569 | - 'dojoType="fox.form.Select"'); |
|
568 | + print_feed_cat_select("cat_id", $cat_id, |
|
569 | + 'dojoType="fox.form.Select"'); |
|
570 | 570 | |
571 | - print "</fieldset>"; |
|
572 | - } |
|
571 | + print "</fieldset>"; |
|
572 | + } |
|
573 | 573 | |
574 | - /* Site URL */ |
|
574 | + /* Site URL */ |
|
575 | 575 | |
576 | - $site_url = htmlspecialchars($row["site_url"]); |
|
576 | + $site_url = htmlspecialchars($row["site_url"]); |
|
577 | 577 | |
578 | - print "<fieldset>"; |
|
578 | + print "<fieldset>"; |
|
579 | 579 | |
580 | - print "<label>" . __('Site URL:') . "</label> "; |
|
581 | - print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
|
580 | + print "<label>" . __('Site URL:') . "</label> "; |
|
581 | + print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
|
582 | 582 | placeHolder=\"".__("Site URL")."\" |
583 | 583 | regExp='^(http|https)://.*' style='width : 300px' |
584 | 584 | name='site_url' value=\"$site_url\">"; |
585 | 585 | |
586 | - print "</fieldset>"; |
|
586 | + print "</fieldset>"; |
|
587 | 587 | |
588 | - /* FTS Stemming Language */ |
|
588 | + /* FTS Stemming Language */ |
|
589 | 589 | |
590 | - if (DB_TYPE == "pgsql") { |
|
591 | - $feed_language = $row["feed_language"]; |
|
590 | + if (DB_TYPE == "pgsql") { |
|
591 | + $feed_language = $row["feed_language"]; |
|
592 | 592 | |
593 | - if (!$feed_language) |
|
594 | - $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE'); |
|
593 | + if (!$feed_language) |
|
594 | + $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE'); |
|
595 | 595 | |
596 | - print "<fieldset>"; |
|
596 | + print "<fieldset>"; |
|
597 | 597 | |
598 | - print "<label>" . __('Language:') . "</label> "; |
|
599 | - print_select("feed_language", $feed_language, $this::get_ts_languages(), |
|
600 | - 'dojoType="fox.form.Select"'); |
|
598 | + print "<label>" . __('Language:') . "</label> "; |
|
599 | + print_select("feed_language", $feed_language, $this::get_ts_languages(), |
|
600 | + 'dojoType="fox.form.Select"'); |
|
601 | 601 | |
602 | - print "</fieldset>"; |
|
603 | - } |
|
602 | + print "</fieldset>"; |
|
603 | + } |
|
604 | 604 | |
605 | - print "</section>"; |
|
605 | + print "</section>"; |
|
606 | 606 | |
607 | - print "<header>".__("Update")."</header>"; |
|
608 | - print "<section>"; |
|
607 | + print "<header>".__("Update")."</header>"; |
|
608 | + print "<section>"; |
|
609 | 609 | |
610 | - /* Update Interval */ |
|
610 | + /* Update Interval */ |
|
611 | 611 | |
612 | - $update_interval = $row["update_interval"]; |
|
612 | + $update_interval = $row["update_interval"]; |
|
613 | 613 | |
614 | - print "<fieldset>"; |
|
614 | + print "<fieldset>"; |
|
615 | 615 | |
616 | - print "<label>".__("Interval:")."</label> "; |
|
616 | + print "<label>".__("Interval:")."</label> "; |
|
617 | 617 | |
618 | - print_select_hash("update_interval", $update_interval, $update_intervals, |
|
619 | - 'dojoType="fox.form.Select"'); |
|
618 | + print_select_hash("update_interval", $update_interval, $update_intervals, |
|
619 | + 'dojoType="fox.form.Select"'); |
|
620 | 620 | |
621 | - print "</fieldset>"; |
|
621 | + print "</fieldset>"; |
|
622 | 622 | |
623 | - /* Purge intl */ |
|
623 | + /* Purge intl */ |
|
624 | 624 | |
625 | - $purge_interval = $row["purge_interval"]; |
|
625 | + $purge_interval = $row["purge_interval"]; |
|
626 | 626 | |
627 | - print "<fieldset>"; |
|
627 | + print "<fieldset>"; |
|
628 | 628 | |
629 | - print "<label>" . __('Article purging:') . "</label> "; |
|
629 | + print "<label>" . __('Article purging:') . "</label> "; |
|
630 | 630 | |
631 | - print_select_hash("purge_interval", $purge_interval, $purge_intervals, |
|
632 | - 'dojoType="fox.form.Select" ' . |
|
633 | - ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"')); |
|
631 | + print_select_hash("purge_interval", $purge_interval, $purge_intervals, |
|
632 | + 'dojoType="fox.form.Select" ' . |
|
633 | + ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"')); |
|
634 | 634 | |
635 | - print "</fieldset>"; |
|
635 | + print "</fieldset>"; |
|
636 | 636 | |
637 | - print "</section>"; |
|
637 | + print "</section>"; |
|
638 | 638 | |
639 | - $auth_login = htmlspecialchars($row["auth_login"]); |
|
640 | - $auth_pass = htmlspecialchars($row["auth_pass"]); |
|
639 | + $auth_login = htmlspecialchars($row["auth_login"]); |
|
640 | + $auth_pass = htmlspecialchars($row["auth_pass"]); |
|
641 | 641 | |
642 | - $auth_enabled = $auth_login !== '' || $auth_pass !== ''; |
|
642 | + $auth_enabled = $auth_login !== '' || $auth_pass !== ''; |
|
643 | 643 | |
644 | - $auth_style = $auth_enabled ? '' : 'display: none'; |
|
645 | - print "<div id='feedEditDlg_loginContainer' style='$auth_style'>"; |
|
646 | - print "<header>".__("Authentication")."</header>"; |
|
647 | - print "<section>"; |
|
644 | + $auth_style = $auth_enabled ? '' : 'display: none'; |
|
645 | + print "<div id='feedEditDlg_loginContainer' style='$auth_style'>"; |
|
646 | + print "<header>".__("Authentication")."</header>"; |
|
647 | + print "<section>"; |
|
648 | 648 | |
649 | - print "<fieldset>"; |
|
649 | + print "<fieldset>"; |
|
650 | 650 | |
651 | - print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login' |
|
651 | + print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login' |
|
652 | 652 | placeHolder='".__("Login")."' |
653 | 653 | autocomplete='new-password' |
654 | 654 | name='auth_login' value=\"$auth_login\">"; |
655 | 655 | |
656 | - print "</fieldset><fieldset>"; |
|
656 | + print "</fieldset><fieldset>"; |
|
657 | 657 | |
658 | - print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass' |
|
658 | + print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass' |
|
659 | 659 | autocomplete='new-password' |
660 | 660 | placeHolder='".__("Password")."' |
661 | 661 | value=\"$auth_pass\">"; |
662 | 662 | |
663 | - print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'> |
|
663 | + print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'> |
|
664 | 664 | ".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')." |
665 | 665 | </div>"; |
666 | 666 | |
667 | - print "</fieldset>"; |
|
667 | + print "</fieldset>"; |
|
668 | 668 | |
669 | - print "</section></div>"; |
|
669 | + print "</section></div>"; |
|
670 | 670 | |
671 | - $auth_checked = $auth_enabled ? 'checked' : ''; |
|
672 | - print "<label class='checkbox'> |
|
671 | + $auth_checked = $auth_enabled ? 'checked' : ''; |
|
672 | + print "<label class='checkbox'> |
|
673 | 673 | <input type='checkbox' $auth_checked name='need_auth' dojoType='dijit.form.CheckBox' id='feedEditDlg_loginCheck' |
674 | 674 | onclick='displayIfChecked(this, \"feedEditDlg_loginContainer\")'> |
675 | 675 | ".__('This feed requires authentication.')."</label>"; |
676 | 676 | |
677 | - print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">'; |
|
677 | + print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">'; |
|
678 | 678 | |
679 | - print "<section class='narrow'>"; |
|
679 | + print "<section class='narrow'>"; |
|
680 | 680 | |
681 | - $include_in_digest = $row["include_in_digest"]; |
|
681 | + $include_in_digest = $row["include_in_digest"]; |
|
682 | 682 | |
683 | - if ($include_in_digest) { |
|
684 | - $checked = "checked=\"1\""; |
|
685 | - } else { |
|
686 | - $checked = ""; |
|
687 | - } |
|
683 | + if ($include_in_digest) { |
|
684 | + $checked = "checked=\"1\""; |
|
685 | + } else { |
|
686 | + $checked = ""; |
|
687 | + } |
|
688 | 688 | |
689 | - print "<fieldset class='narrow'>"; |
|
689 | + print "<fieldset class='narrow'>"; |
|
690 | 690 | |
691 | - print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\" |
|
691 | + print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\" |
|
692 | 692 | name=\"include_in_digest\" |
693 | 693 | $checked> ".__('Include in e-mail digest')."</label>"; |
694 | 694 | |
695 | - print "</fieldset>"; |
|
695 | + print "</fieldset>"; |
|
696 | 696 | |
697 | - $always_display_enclosures = $row["always_display_enclosures"]; |
|
697 | + $always_display_enclosures = $row["always_display_enclosures"]; |
|
698 | 698 | |
699 | - if ($always_display_enclosures) { |
|
700 | - $checked = "checked"; |
|
701 | - } else { |
|
702 | - $checked = ""; |
|
703 | - } |
|
699 | + if ($always_display_enclosures) { |
|
700 | + $checked = "checked"; |
|
701 | + } else { |
|
702 | + $checked = ""; |
|
703 | + } |
|
704 | 704 | |
705 | - print "<fieldset class='narrow'>"; |
|
705 | + print "<fieldset class='narrow'>"; |
|
706 | 706 | |
707 | - print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\" |
|
707 | + print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\" |
|
708 | 708 | name=\"always_display_enclosures\" |
709 | 709 | $checked> ".__('Always display image attachments')."</label>"; |
710 | 710 | |
711 | - print "</fieldset>"; |
|
711 | + print "</fieldset>"; |
|
712 | 712 | |
713 | - $hide_images = $row["hide_images"]; |
|
713 | + $hide_images = $row["hide_images"]; |
|
714 | 714 | |
715 | - if ($hide_images) { |
|
716 | - $checked = "checked=\"1\""; |
|
717 | - } else { |
|
718 | - $checked = ""; |
|
719 | - } |
|
715 | + if ($hide_images) { |
|
716 | + $checked = "checked=\"1\""; |
|
717 | + } else { |
|
718 | + $checked = ""; |
|
719 | + } |
|
720 | 720 | |
721 | - print "<fieldset class='narrow'>"; |
|
721 | + print "<fieldset class='narrow'>"; |
|
722 | 722 | |
723 | - print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images' |
|
723 | + print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images' |
|
724 | 724 | name='hide_images' $checked> ".__('Do not embed media')."</label>"; |
725 | 725 | |
726 | - print "</fieldset>"; |
|
726 | + print "</fieldset>"; |
|
727 | 727 | |
728 | - $cache_images = $row["cache_images"]; |
|
728 | + $cache_images = $row["cache_images"]; |
|
729 | 729 | |
730 | - if ($cache_images) { |
|
731 | - $checked = "checked=\"1\""; |
|
732 | - } else { |
|
733 | - $checked = ""; |
|
734 | - } |
|
730 | + if ($cache_images) { |
|
731 | + $checked = "checked=\"1\""; |
|
732 | + } else { |
|
733 | + $checked = ""; |
|
734 | + } |
|
735 | 735 | |
736 | - print "<fieldset class='narrow'>"; |
|
736 | + print "<fieldset class='narrow'>"; |
|
737 | 737 | |
738 | - print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images' |
|
738 | + print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images' |
|
739 | 739 | name='cache_images' $checked> ". __('Cache media')."</label>"; |
740 | 740 | |
741 | - print "</fieldset>"; |
|
741 | + print "</fieldset>"; |
|
742 | 742 | |
743 | - $mark_unread_on_update = $row["mark_unread_on_update"]; |
|
743 | + $mark_unread_on_update = $row["mark_unread_on_update"]; |
|
744 | 744 | |
745 | - if ($mark_unread_on_update) { |
|
746 | - $checked = "checked"; |
|
747 | - } else { |
|
748 | - $checked = ""; |
|
749 | - } |
|
745 | + if ($mark_unread_on_update) { |
|
746 | + $checked = "checked"; |
|
747 | + } else { |
|
748 | + $checked = ""; |
|
749 | + } |
|
750 | 750 | |
751 | - print "<fieldset class='narrow'>"; |
|
751 | + print "<fieldset class='narrow'>"; |
|
752 | 752 | |
753 | - print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update' |
|
753 | + print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update' |
|
754 | 754 | name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>"; |
755 | 755 | |
756 | - print "</fieldset>"; |
|
756 | + print "</fieldset>"; |
|
757 | 757 | |
758 | - print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">'; |
|
758 | + print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">'; |
|
759 | 759 | |
760 | - /* Icon */ |
|
760 | + /* Icon */ |
|
761 | 761 | |
762 | - print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">"; |
|
762 | + print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">"; |
|
763 | 763 | |
764 | - print "<form onsubmit='return false;' id='feed_icon_upload_form' |
|
764 | + print "<form onsubmit='return false;' id='feed_icon_upload_form' |
|
765 | 765 | enctype='multipart/form-data' method='POST'> |
766 | 766 | <label class='dijitButton'>".__("Choose file...")." |
767 | 767 | <input style='display: none' id='icon_file' size='10' name='icon_file' type='file'> |
@@ -775,231 +775,231 @@ discard block |
||
775 | 775 | type='submit'>".__('Remove')."</button> |
776 | 776 | </form>"; |
777 | 777 | |
778 | - print "</section>"; |
|
778 | + print "</section>"; |
|
779 | 779 | |
780 | - print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">'; |
|
780 | + print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">'; |
|
781 | 781 | |
782 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, |
|
783 | - "hook_prefs_edit_feed", $feed_id); |
|
782 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, |
|
783 | + "hook_prefs_edit_feed", $feed_id); |
|
784 | 784 | |
785 | - print "</div></div>"; |
|
785 | + print "</div></div>"; |
|
786 | 786 | |
787 | - $title = htmlspecialchars($title, ENT_QUOTES); |
|
787 | + $title = htmlspecialchars($title, ENT_QUOTES); |
|
788 | 788 | |
789 | - print "<footer> |
|
789 | + print "<footer> |
|
790 | 790 | <button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>". |
791 | - __('Unsubscribe')."</button> |
|
791 | + __('Unsubscribe')."</button> |
|
792 | 792 | <button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button> |
793 | 793 | <button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button> |
794 | 794 | </footer>"; |
795 | - } |
|
796 | - } |
|
795 | + } |
|
796 | + } |
|
797 | 797 | |
798 | - public function editfeeds() { |
|
799 | - global $purge_intervals; |
|
800 | - global $update_intervals; |
|
798 | + public function editfeeds() { |
|
799 | + global $purge_intervals; |
|
800 | + global $update_intervals; |
|
801 | 801 | |
802 | - $feed_ids = clean($_REQUEST["ids"]); |
|
802 | + $feed_ids = clean($_REQUEST["ids"]); |
|
803 | 803 | |
804 | - print_notice("Enable the options you wish to apply using checkboxes on the right:"); |
|
804 | + print_notice("Enable the options you wish to apply using checkboxes on the right:"); |
|
805 | 805 | |
806 | - print "<p>"; |
|
806 | + print "<p>"; |
|
807 | 807 | |
808 | - print_hidden("ids", "$feed_ids"); |
|
809 | - print_hidden("op", "pref-feeds"); |
|
810 | - print_hidden("method", "batchEditSave"); |
|
808 | + print_hidden("ids", "$feed_ids"); |
|
809 | + print_hidden("op", "pref-feeds"); |
|
810 | + print_hidden("method", "batchEditSave"); |
|
811 | 811 | |
812 | - print "<header>".__("Feed")."</header>"; |
|
813 | - print "<section>"; |
|
812 | + print "<header>".__("Feed")."</header>"; |
|
813 | + print "<section>"; |
|
814 | 814 | |
815 | - /* Category */ |
|
815 | + /* Category */ |
|
816 | 816 | |
817 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
817 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
818 | 818 | |
819 | - print "<fieldset>"; |
|
819 | + print "<fieldset>"; |
|
820 | 820 | |
821 | - print "<label>" . __('Place in category:') . "</label> "; |
|
821 | + print "<label>" . __('Place in category:') . "</label> "; |
|
822 | 822 | |
823 | - print_feed_cat_select("cat_id", false, |
|
824 | - 'disabled="1" dojoType="fox.form.Select"'); |
|
823 | + print_feed_cat_select("cat_id", false, |
|
824 | + 'disabled="1" dojoType="fox.form.Select"'); |
|
825 | 825 | |
826 | - $this->batch_edit_cbox("cat_id"); |
|
826 | + $this->batch_edit_cbox("cat_id"); |
|
827 | 827 | |
828 | - print "</fieldset>"; |
|
829 | - } |
|
828 | + print "</fieldset>"; |
|
829 | + } |
|
830 | 830 | |
831 | - /* FTS Stemming Language */ |
|
831 | + /* FTS Stemming Language */ |
|
832 | 832 | |
833 | - if (DB_TYPE == "pgsql") { |
|
834 | - print "<fieldset>"; |
|
833 | + if (DB_TYPE == "pgsql") { |
|
834 | + print "<fieldset>"; |
|
835 | 835 | |
836 | - print "<label>" . __('Language:') . "</label> "; |
|
837 | - print_select("feed_language", "", $this::get_ts_languages(), |
|
838 | - 'disabled="1" dojoType="fox.form.Select"'); |
|
836 | + print "<label>" . __('Language:') . "</label> "; |
|
837 | + print_select("feed_language", "", $this::get_ts_languages(), |
|
838 | + 'disabled="1" dojoType="fox.form.Select"'); |
|
839 | 839 | |
840 | - $this->batch_edit_cbox("feed_language"); |
|
840 | + $this->batch_edit_cbox("feed_language"); |
|
841 | 841 | |
842 | - print "</fieldset>"; |
|
843 | - } |
|
842 | + print "</fieldset>"; |
|
843 | + } |
|
844 | 844 | |
845 | - print "</section>"; |
|
845 | + print "</section>"; |
|
846 | 846 | |
847 | - print "<header>".__("Update")."</header>"; |
|
848 | - print "<section>"; |
|
847 | + print "<header>".__("Update")."</header>"; |
|
848 | + print "<section>"; |
|
849 | 849 | |
850 | - /* Update Interval */ |
|
850 | + /* Update Interval */ |
|
851 | 851 | |
852 | - print "<fieldset>"; |
|
852 | + print "<fieldset>"; |
|
853 | 853 | |
854 | - print "<label>".__("Interval:")."</label> "; |
|
854 | + print "<label>".__("Interval:")."</label> "; |
|
855 | 855 | |
856 | - print_select_hash("update_interval", "", $update_intervals, |
|
857 | - 'disabled="1" dojoType="fox.form.Select"'); |
|
856 | + print_select_hash("update_interval", "", $update_intervals, |
|
857 | + 'disabled="1" dojoType="fox.form.Select"'); |
|
858 | 858 | |
859 | - $this->batch_edit_cbox("update_interval"); |
|
859 | + $this->batch_edit_cbox("update_interval"); |
|
860 | 860 | |
861 | - print "</fieldset>"; |
|
861 | + print "</fieldset>"; |
|
862 | 862 | |
863 | - /* Purge intl */ |
|
863 | + /* Purge intl */ |
|
864 | 864 | |
865 | - if (FORCE_ARTICLE_PURGE == 0) { |
|
865 | + if (FORCE_ARTICLE_PURGE == 0) { |
|
866 | 866 | |
867 | - print "<fieldset>"; |
|
867 | + print "<fieldset>"; |
|
868 | 868 | |
869 | - print "<label>" . __('Article purging:') . "</label> "; |
|
869 | + print "<label>" . __('Article purging:') . "</label> "; |
|
870 | 870 | |
871 | - print_select_hash("purge_interval", "", $purge_intervals, |
|
872 | - 'disabled="1" dojoType="fox.form.Select"'); |
|
871 | + print_select_hash("purge_interval", "", $purge_intervals, |
|
872 | + 'disabled="1" dojoType="fox.form.Select"'); |
|
873 | 873 | |
874 | - $this->batch_edit_cbox("purge_interval"); |
|
874 | + $this->batch_edit_cbox("purge_interval"); |
|
875 | 875 | |
876 | - print "</fieldset>"; |
|
877 | - } |
|
876 | + print "</fieldset>"; |
|
877 | + } |
|
878 | 878 | |
879 | - print "</section>"; |
|
880 | - print "<header>".__("Authentication")."</header>"; |
|
881 | - print "<section>"; |
|
879 | + print "</section>"; |
|
880 | + print "<header>".__("Authentication")."</header>"; |
|
881 | + print "<section>"; |
|
882 | 882 | |
883 | - print "<fieldset>"; |
|
883 | + print "<fieldset>"; |
|
884 | 884 | |
885 | - print "<input dojoType='dijit.form.TextBox' |
|
885 | + print "<input dojoType='dijit.form.TextBox' |
|
886 | 886 | placeHolder=\"".__("Login")."\" disabled='1' |
887 | 887 | autocomplete='new-password' |
888 | 888 | name='auth_login' value=''>"; |
889 | 889 | |
890 | - $this->batch_edit_cbox("auth_login"); |
|
890 | + $this->batch_edit_cbox("auth_login"); |
|
891 | 891 | |
892 | - print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass' |
|
892 | + print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass' |
|
893 | 893 | autocomplete='new-password' |
894 | 894 | placeHolder=\"".__("Password")."\" disabled='1' |
895 | 895 | value=''>"; |
896 | 896 | |
897 | - $this->batch_edit_cbox("auth_pass"); |
|
897 | + $this->batch_edit_cbox("auth_pass"); |
|
898 | 898 | |
899 | - print "</fieldset>"; |
|
899 | + print "</fieldset>"; |
|
900 | 900 | |
901 | - print "</section>"; |
|
902 | - print "<header>".__("Options")."</header>"; |
|
903 | - print "<section>"; |
|
901 | + print "</section>"; |
|
902 | + print "<header>".__("Options")."</header>"; |
|
903 | + print "<section>"; |
|
904 | 904 | |
905 | - print "<fieldset class='narrow'>"; |
|
906 | - print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest' |
|
905 | + print "<fieldset class='narrow'>"; |
|
906 | + print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest' |
|
907 | 907 | name='include_in_digest' dojoType='dijit.form.CheckBox'> ".__('Include in e-mail digest')."</label>"; |
908 | 908 | |
909 | - print " "; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l"); |
|
909 | + print " "; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l"); |
|
910 | 910 | |
911 | - print "</fieldset><fieldset class='narrow'>"; |
|
911 | + print "</fieldset><fieldset class='narrow'>"; |
|
912 | 912 | |
913 | - print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures' |
|
913 | + print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures' |
|
914 | 914 | name='always_display_enclosures' dojoType='dijit.form.CheckBox'> ".__('Always display image attachments')."</label>"; |
915 | 915 | |
916 | - print " "; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l"); |
|
916 | + print " "; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l"); |
|
917 | 917 | |
918 | - print "</fieldset><fieldset class='narrow'>"; |
|
918 | + print "</fieldset><fieldset class='narrow'>"; |
|
919 | 919 | |
920 | - print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images' |
|
920 | + print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images' |
|
921 | 921 | name='hide_images' dojoType='dijit.form.CheckBox'> ". __('Do not embed media')."</label>"; |
922 | 922 | |
923 | - print " "; $this->batch_edit_cbox("hide_images", "hide_images_l"); |
|
923 | + print " "; $this->batch_edit_cbox("hide_images", "hide_images_l"); |
|
924 | 924 | |
925 | - print "</fieldset><fieldset class='narrow'>"; |
|
925 | + print "</fieldset><fieldset class='narrow'>"; |
|
926 | 926 | |
927 | - print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images' |
|
927 | + print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images' |
|
928 | 928 | name='cache_images' dojoType='dijit.form.CheckBox'> ".__('Cache media')."</label>"; |
929 | 929 | |
930 | - print " "; $this->batch_edit_cbox("cache_images", "cache_images_l"); |
|
930 | + print " "; $this->batch_edit_cbox("cache_images", "cache_images_l"); |
|
931 | 931 | |
932 | - print "</fieldset><fieldset class='narrow'>"; |
|
932 | + print "</fieldset><fieldset class='narrow'>"; |
|
933 | 933 | |
934 | - print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update' |
|
934 | + print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update' |
|
935 | 935 | name='mark_unread_on_update' dojoType='dijit.form.CheckBox'> ".__('Mark updated articles as unread')."</label>"; |
936 | 936 | |
937 | - print " "; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l"); |
|
937 | + print " "; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l"); |
|
938 | 938 | |
939 | - print "</fieldset>"; |
|
939 | + print "</fieldset>"; |
|
940 | 940 | |
941 | - print "</section>"; |
|
941 | + print "</section>"; |
|
942 | 942 | |
943 | - print "<footer> |
|
943 | + print "<footer> |
|
944 | 944 | <button dojoType='dijit.form.Button' type='submit' class='alt-primary' |
945 | 945 | onclick=\"return dijit.byId('feedEditDlg').execute()\">". |
946 | - __('Save')."</button> |
|
946 | + __('Save')."</button> |
|
947 | 947 | <button dojoType='dijit.form.Button' |
948 | 948 | onclick=\"return dijit.byId('feedEditDlg').hide()\">". |
949 | - __('Cancel')."</button> |
|
949 | + __('Cancel')."</button> |
|
950 | 950 | </footer>"; |
951 | 951 | |
952 | - return; |
|
953 | - } |
|
954 | - |
|
955 | - public function batchEditSave() { |
|
956 | - return $this->editsaveops(true); |
|
957 | - } |
|
958 | - |
|
959 | - public function editSave() { |
|
960 | - return $this->editsaveops(false); |
|
961 | - } |
|
962 | - |
|
963 | - public function editsaveops($batch) { |
|
964 | - |
|
965 | - $feed_title = trim(clean($_POST["title"])); |
|
966 | - $feed_url = trim(clean($_POST["feed_url"])); |
|
967 | - $site_url = trim(clean($_POST["site_url"])); |
|
968 | - $upd_intl = (int) clean($_POST["update_interval"]); |
|
969 | - $purge_intl = (int) clean($_POST["purge_interval"]); |
|
970 | - $feed_id = (int) clean($_POST["id"]); /* editSave */ |
|
971 | - $feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */ |
|
972 | - $cat_id = (int) clean($_POST["cat_id"]); |
|
973 | - $auth_login = trim(clean($_POST["auth_login"])); |
|
974 | - $auth_pass = trim(clean($_POST["auth_pass"])); |
|
975 | - $private = checkbox_to_sql_bool(clean($_POST["private"])); |
|
976 | - $include_in_digest = checkbox_to_sql_bool( |
|
977 | - clean($_POST["include_in_digest"])); |
|
978 | - $cache_images = checkbox_to_sql_bool( |
|
979 | - clean($_POST["cache_images"])); |
|
980 | - $hide_images = checkbox_to_sql_bool( |
|
981 | - clean($_POST["hide_images"])); |
|
982 | - $always_display_enclosures = checkbox_to_sql_bool( |
|
983 | - clean($_POST["always_display_enclosures"])); |
|
984 | - |
|
985 | - $mark_unread_on_update = checkbox_to_sql_bool( |
|
986 | - clean($_POST["mark_unread_on_update"])); |
|
987 | - |
|
988 | - $feed_language = trim(clean($_POST["feed_language"])); |
|
989 | - |
|
990 | - if (!$batch) { |
|
991 | - if (clean($_POST["need_auth"]) !== 'on') { |
|
992 | - $auth_login = ''; |
|
993 | - $auth_pass = ''; |
|
994 | - } |
|
995 | - |
|
996 | - /* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?"); |
|
952 | + return; |
|
953 | + } |
|
954 | + |
|
955 | + public function batchEditSave() { |
|
956 | + return $this->editsaveops(true); |
|
957 | + } |
|
958 | + |
|
959 | + public function editSave() { |
|
960 | + return $this->editsaveops(false); |
|
961 | + } |
|
962 | + |
|
963 | + public function editsaveops($batch) { |
|
964 | + |
|
965 | + $feed_title = trim(clean($_POST["title"])); |
|
966 | + $feed_url = trim(clean($_POST["feed_url"])); |
|
967 | + $site_url = trim(clean($_POST["site_url"])); |
|
968 | + $upd_intl = (int) clean($_POST["update_interval"]); |
|
969 | + $purge_intl = (int) clean($_POST["purge_interval"]); |
|
970 | + $feed_id = (int) clean($_POST["id"]); /* editSave */ |
|
971 | + $feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */ |
|
972 | + $cat_id = (int) clean($_POST["cat_id"]); |
|
973 | + $auth_login = trim(clean($_POST["auth_login"])); |
|
974 | + $auth_pass = trim(clean($_POST["auth_pass"])); |
|
975 | + $private = checkbox_to_sql_bool(clean($_POST["private"])); |
|
976 | + $include_in_digest = checkbox_to_sql_bool( |
|
977 | + clean($_POST["include_in_digest"])); |
|
978 | + $cache_images = checkbox_to_sql_bool( |
|
979 | + clean($_POST["cache_images"])); |
|
980 | + $hide_images = checkbox_to_sql_bool( |
|
981 | + clean($_POST["hide_images"])); |
|
982 | + $always_display_enclosures = checkbox_to_sql_bool( |
|
983 | + clean($_POST["always_display_enclosures"])); |
|
984 | + |
|
985 | + $mark_unread_on_update = checkbox_to_sql_bool( |
|
986 | + clean($_POST["mark_unread_on_update"])); |
|
987 | + |
|
988 | + $feed_language = trim(clean($_POST["feed_language"])); |
|
989 | + |
|
990 | + if (!$batch) { |
|
991 | + if (clean($_POST["need_auth"]) !== 'on') { |
|
992 | + $auth_login = ''; |
|
993 | + $auth_pass = ''; |
|
994 | + } |
|
995 | + |
|
996 | + /* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?"); |
|
997 | 997 | $sth->execute([$feed_id]); |
998 | 998 | $row = $sth->fetch();$orig_feed_url = $row["feed_url"]; |
999 | 999 | |
1000 | 1000 | $reset_basic_info = $orig_feed_url != $feed_url; */ |
1001 | 1001 | |
1002 | - $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET |
|
1002 | + $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET |
|
1003 | 1003 | cat_id = :cat_id, |
1004 | 1004 | title = :title, |
1005 | 1005 | feed_url = :feed_url, |
@@ -1018,253 +1018,253 @@ discard block |
||
1018 | 1018 | feed_language = :feed_language |
1019 | 1019 | WHERE id = :id AND owner_uid = :uid"); |
1020 | 1020 | |
1021 | - $sth->execute([":title" => $feed_title, |
|
1022 | - ":cat_id" => $cat_id ? $cat_id : null, |
|
1023 | - ":feed_url" => $feed_url, |
|
1024 | - ":site_url" => $site_url, |
|
1025 | - ":upd_intl" => $upd_intl, |
|
1026 | - ":purge_intl" => $purge_intl, |
|
1027 | - ":auth_login" => $auth_login, |
|
1028 | - ":auth_pass" => $auth_pass, |
|
1029 | - ":private" => (int)$private, |
|
1030 | - ":cache_images" => (int)$cache_images, |
|
1031 | - ":hide_images" => (int)$hide_images, |
|
1032 | - ":include_in_digest" => (int)$include_in_digest, |
|
1033 | - ":always_display_enclosures" => (int)$always_display_enclosures, |
|
1034 | - ":mark_unread_on_update" => (int)$mark_unread_on_update, |
|
1035 | - ":feed_language" => $feed_language, |
|
1036 | - ":id" => $feed_id, |
|
1037 | - ":uid" => $_SESSION['uid']]); |
|
1021 | + $sth->execute([":title" => $feed_title, |
|
1022 | + ":cat_id" => $cat_id ? $cat_id : null, |
|
1023 | + ":feed_url" => $feed_url, |
|
1024 | + ":site_url" => $site_url, |
|
1025 | + ":upd_intl" => $upd_intl, |
|
1026 | + ":purge_intl" => $purge_intl, |
|
1027 | + ":auth_login" => $auth_login, |
|
1028 | + ":auth_pass" => $auth_pass, |
|
1029 | + ":private" => (int)$private, |
|
1030 | + ":cache_images" => (int)$cache_images, |
|
1031 | + ":hide_images" => (int)$hide_images, |
|
1032 | + ":include_in_digest" => (int)$include_in_digest, |
|
1033 | + ":always_display_enclosures" => (int)$always_display_enclosures, |
|
1034 | + ":mark_unread_on_update" => (int)$mark_unread_on_update, |
|
1035 | + ":feed_language" => $feed_language, |
|
1036 | + ":id" => $feed_id, |
|
1037 | + ":uid" => $_SESSION['uid']]); |
|
1038 | 1038 | |
1039 | 1039 | /* if ($reset_basic_info) { |
1040 | 1040 | RSSUtils::set_basic_feed_info($feed_id); |
1041 | 1041 | } */ |
1042 | 1042 | |
1043 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED, |
|
1044 | - "hook_prefs_save_feed", $feed_id); |
|
1043 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED, |
|
1044 | + "hook_prefs_save_feed", $feed_id); |
|
1045 | 1045 | |
1046 | - } else { |
|
1047 | - $feed_data = array(); |
|
1046 | + } else { |
|
1047 | + $feed_data = array(); |
|
1048 | 1048 | |
1049 | - foreach (array_keys($_POST) as $k) { |
|
1050 | - if ($k != "op" && $k != "method" && $k != "ids") { |
|
1051 | - $feed_data[$k] = clean($_POST[$k]); |
|
1052 | - } |
|
1053 | - } |
|
1049 | + foreach (array_keys($_POST) as $k) { |
|
1050 | + if ($k != "op" && $k != "method" && $k != "ids") { |
|
1051 | + $feed_data[$k] = clean($_POST[$k]); |
|
1052 | + } |
|
1053 | + } |
|
1054 | 1054 | |
1055 | - $this->pdo->beginTransaction(); |
|
1055 | + $this->pdo->beginTransaction(); |
|
1056 | 1056 | |
1057 | - $feed_ids_qmarks = arr_qmarks($feed_ids); |
|
1057 | + $feed_ids_qmarks = arr_qmarks($feed_ids); |
|
1058 | 1058 | |
1059 | - foreach (array_keys($feed_data) as $k) { |
|
1059 | + foreach (array_keys($feed_data) as $k) { |
|
1060 | 1060 | |
1061 | - $qpart = ""; |
|
1061 | + $qpart = ""; |
|
1062 | 1062 | |
1063 | - switch ($k) { |
|
1064 | - case "title": |
|
1065 | - $qpart = "title = " . $this->pdo->quote($feed_title); |
|
1066 | - break; |
|
1063 | + switch ($k) { |
|
1064 | + case "title": |
|
1065 | + $qpart = "title = " . $this->pdo->quote($feed_title); |
|
1066 | + break; |
|
1067 | 1067 | |
1068 | - case "feed_url": |
|
1069 | - $qpart = "feed_url = " . $this->pdo->quote($feed_url); |
|
1070 | - break; |
|
1068 | + case "feed_url": |
|
1069 | + $qpart = "feed_url = " . $this->pdo->quote($feed_url); |
|
1070 | + break; |
|
1071 | 1071 | |
1072 | - case "update_interval": |
|
1073 | - $qpart = "update_interval = " . $this->pdo->quote($upd_intl); |
|
1074 | - break; |
|
1072 | + case "update_interval": |
|
1073 | + $qpart = "update_interval = " . $this->pdo->quote($upd_intl); |
|
1074 | + break; |
|
1075 | 1075 | |
1076 | - case "purge_interval": |
|
1077 | - $qpart = "purge_interval =" . $this->pdo->quote($purge_intl); |
|
1078 | - break; |
|
1076 | + case "purge_interval": |
|
1077 | + $qpart = "purge_interval =" . $this->pdo->quote($purge_intl); |
|
1078 | + break; |
|
1079 | 1079 | |
1080 | - case "auth_login": |
|
1081 | - $qpart = "auth_login = " . $this->pdo->quote($auth_login); |
|
1082 | - break; |
|
1080 | + case "auth_login": |
|
1081 | + $qpart = "auth_login = " . $this->pdo->quote($auth_login); |
|
1082 | + break; |
|
1083 | 1083 | |
1084 | - case "auth_pass": |
|
1085 | - $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false"; |
|
1086 | - break; |
|
1084 | + case "auth_pass": |
|
1085 | + $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false"; |
|
1086 | + break; |
|
1087 | 1087 | |
1088 | - case "private": |
|
1089 | - $qpart = "private = " . $this->pdo->quote($private); |
|
1090 | - break; |
|
1088 | + case "private": |
|
1089 | + $qpart = "private = " . $this->pdo->quote($private); |
|
1090 | + break; |
|
1091 | 1091 | |
1092 | - case "include_in_digest": |
|
1093 | - $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest); |
|
1094 | - break; |
|
1092 | + case "include_in_digest": |
|
1093 | + $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest); |
|
1094 | + break; |
|
1095 | 1095 | |
1096 | - case "always_display_enclosures": |
|
1097 | - $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures); |
|
1098 | - break; |
|
1096 | + case "always_display_enclosures": |
|
1097 | + $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures); |
|
1098 | + break; |
|
1099 | 1099 | |
1100 | - case "mark_unread_on_update": |
|
1101 | - $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update); |
|
1102 | - break; |
|
1100 | + case "mark_unread_on_update": |
|
1101 | + $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update); |
|
1102 | + break; |
|
1103 | 1103 | |
1104 | - case "cache_images": |
|
1105 | - $qpart = "cache_images = " . $this->pdo->quote($cache_images); |
|
1106 | - break; |
|
1104 | + case "cache_images": |
|
1105 | + $qpart = "cache_images = " . $this->pdo->quote($cache_images); |
|
1106 | + break; |
|
1107 | 1107 | |
1108 | - case "hide_images": |
|
1109 | - $qpart = "hide_images = " . $this->pdo->quote($hide_images); |
|
1110 | - break; |
|
1108 | + case "hide_images": |
|
1109 | + $qpart = "hide_images = " . $this->pdo->quote($hide_images); |
|
1110 | + break; |
|
1111 | 1111 | |
1112 | - case "cat_id": |
|
1113 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
1114 | - if ($cat_id) { |
|
1115 | - $qpart = "cat_id = " . $this->pdo->quote($cat_id); |
|
1116 | - } else { |
|
1117 | - $qpart = 'cat_id = NULL'; |
|
1118 | - } |
|
1119 | - } else { |
|
1120 | - $qpart = ""; |
|
1121 | - } |
|
1112 | + case "cat_id": |
|
1113 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
1114 | + if ($cat_id) { |
|
1115 | + $qpart = "cat_id = " . $this->pdo->quote($cat_id); |
|
1116 | + } else { |
|
1117 | + $qpart = 'cat_id = NULL'; |
|
1118 | + } |
|
1119 | + } else { |
|
1120 | + $qpart = ""; |
|
1121 | + } |
|
1122 | 1122 | |
1123 | - break; |
|
1123 | + break; |
|
1124 | 1124 | |
1125 | - case "feed_language": |
|
1126 | - $qpart = "feed_language = " . $this->pdo->quote($feed_language); |
|
1127 | - break; |
|
1125 | + case "feed_language": |
|
1126 | + $qpart = "feed_language = " . $this->pdo->quote($feed_language); |
|
1127 | + break; |
|
1128 | 1128 | |
1129 | - } |
|
1129 | + } |
|
1130 | 1130 | |
1131 | - if ($qpart) { |
|
1132 | - $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks) |
|
1131 | + if ($qpart) { |
|
1132 | + $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks) |
|
1133 | 1133 | AND owner_uid = ?"); |
1134 | - $sth->execute(array_merge($feed_ids, [$_SESSION['uid']])); |
|
1135 | - } |
|
1136 | - } |
|
1134 | + $sth->execute(array_merge($feed_ids, [$_SESSION['uid']])); |
|
1135 | + } |
|
1136 | + } |
|
1137 | 1137 | |
1138 | - $this->pdo->commit(); |
|
1139 | - } |
|
1140 | - return; |
|
1141 | - } |
|
1138 | + $this->pdo->commit(); |
|
1139 | + } |
|
1140 | + return; |
|
1141 | + } |
|
1142 | 1142 | |
1143 | - public function remove() { |
|
1143 | + public function remove() { |
|
1144 | 1144 | |
1145 | - $ids = explode(",", clean($_REQUEST["ids"])); |
|
1145 | + $ids = explode(",", clean($_REQUEST["ids"])); |
|
1146 | 1146 | |
1147 | - foreach ($ids as $id) { |
|
1148 | - Pref_Feeds::remove_feed($id, $_SESSION["uid"]); |
|
1149 | - } |
|
1147 | + foreach ($ids as $id) { |
|
1148 | + Pref_Feeds::remove_feed($id, $_SESSION["uid"]); |
|
1149 | + } |
|
1150 | 1150 | |
1151 | - return; |
|
1152 | - } |
|
1151 | + return; |
|
1152 | + } |
|
1153 | 1153 | |
1154 | - public function removeCat() { |
|
1155 | - $ids = explode(",", clean($_REQUEST["ids"])); |
|
1156 | - foreach ($ids as $id) { |
|
1157 | - $this->remove_feed_category($id, $_SESSION["uid"]); |
|
1158 | - } |
|
1159 | - } |
|
1154 | + public function removeCat() { |
|
1155 | + $ids = explode(",", clean($_REQUEST["ids"])); |
|
1156 | + foreach ($ids as $id) { |
|
1157 | + $this->remove_feed_category($id, $_SESSION["uid"]); |
|
1158 | + } |
|
1159 | + } |
|
1160 | 1160 | |
1161 | - public function addCat() { |
|
1162 | - $feed_cat = trim(clean($_REQUEST["cat"])); |
|
1161 | + public function addCat() { |
|
1162 | + $feed_cat = trim(clean($_REQUEST["cat"])); |
|
1163 | 1163 | |
1164 | - Feeds::add_feed_category($feed_cat); |
|
1165 | - } |
|
1164 | + Feeds::add_feed_category($feed_cat); |
|
1165 | + } |
|
1166 | 1166 | |
1167 | - public function index() { |
|
1167 | + public function index() { |
|
1168 | 1168 | |
1169 | - print "<div dojoType='dijit.layout.AccordionContainer' region='center'>"; |
|
1170 | - print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane' |
|
1169 | + print "<div dojoType='dijit.layout.AccordionContainer' region='center'>"; |
|
1170 | + print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane' |
|
1171 | 1171 | title=\"<i class='material-icons'>rss_feed</i> ".__('Feeds')."\">"; |
1172 | 1172 | |
1173 | - $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors |
|
1173 | + $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors |
|
1174 | 1174 | FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?"); |
1175 | - $sth->execute([$_SESSION['uid']]); |
|
1175 | + $sth->execute([$_SESSION['uid']]); |
|
1176 | 1176 | |
1177 | - if ($row = $sth->fetch()) { |
|
1178 | - $num_errors = $row["num_errors"]; |
|
1179 | - } else { |
|
1180 | - $num_errors = 0; |
|
1181 | - } |
|
1177 | + if ($row = $sth->fetch()) { |
|
1178 | + $num_errors = $row["num_errors"]; |
|
1179 | + } else { |
|
1180 | + $num_errors = 0; |
|
1181 | + } |
|
1182 | 1182 | |
1183 | - if ($num_errors > 0) { |
|
1183 | + if ($num_errors > 0) { |
|
1184 | 1184 | |
1185 | - $error_button = "<button dojoType=\"dijit.form.Button\" |
|
1185 | + $error_button = "<button dojoType=\"dijit.form.Button\" |
|
1186 | 1186 | onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" . |
1187 | - __("Feeds with errors") . "</button>"; |
|
1188 | - } |
|
1187 | + __("Feeds with errors") . "</button>"; |
|
1188 | + } |
|
1189 | 1189 | |
1190 | - $inactive_button = "<button dojoType=\"dijit.form.Button\" |
|
1190 | + $inactive_button = "<button dojoType=\"dijit.form.Button\" |
|
1191 | 1191 | id=\"pref_feeds_inactive_btn\" |
1192 | 1192 | style=\"display : none\" |
1193 | 1193 | onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" . |
1194 | - __("Inactive feeds") . "</button>"; |
|
1194 | + __("Inactive feeds") . "</button>"; |
|
1195 | 1195 | |
1196 | - $feed_search = clean($_REQUEST["search"]); |
|
1196 | + $feed_search = clean($_REQUEST["search"]); |
|
1197 | 1197 | |
1198 | - if (array_key_exists("search", $_REQUEST)) { |
|
1199 | - $_SESSION["prefs_feed_search"] = $feed_search; |
|
1200 | - } else { |
|
1201 | - $feed_search = $_SESSION["prefs_feed_search"]; |
|
1202 | - } |
|
1198 | + if (array_key_exists("search", $_REQUEST)) { |
|
1199 | + $_SESSION["prefs_feed_search"] = $feed_search; |
|
1200 | + } else { |
|
1201 | + $feed_search = $_SESSION["prefs_feed_search"]; |
|
1202 | + } |
|
1203 | 1203 | |
1204 | - print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; |
|
1204 | + print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; |
|
1205 | 1205 | |
1206 | - print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar |
|
1206 | + print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar |
|
1207 | 1207 | |
1208 | - print "<div style='float : right; padding-right : 4px;'> |
|
1208 | + print "<div style='float : right; padding-right : 4px;'> |
|
1209 | 1209 | <input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\" |
1210 | 1210 | value=\"$feed_search\"> |
1211 | 1211 | <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedTree').reload()\">". |
1212 | - __('Search')."</button> |
|
1212 | + __('Search')."</button> |
|
1213 | 1213 | </div>"; |
1214 | 1214 | |
1215 | - print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1216 | - "<span>" . __('Select')."</span>"; |
|
1217 | - print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1218 | - print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\" |
|
1215 | + print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1216 | + "<span>" . __('Select')."</span>"; |
|
1217 | + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1218 | + print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\" |
|
1219 | 1219 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
1220 | - print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\" |
|
1220 | + print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\" |
|
1221 | 1221 | dojoType=\"dijit.MenuItem\">".__('None')."</div>"; |
1222 | - print "</div></div>"; |
|
1222 | + print "</div></div>"; |
|
1223 | 1223 | |
1224 | - print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1225 | - "<span>" . __('Feeds')."</span>"; |
|
1226 | - print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1227 | - print "<div onclick=\"CommonDialogs.quickAddFeed()\" |
|
1224 | + print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1225 | + "<span>" . __('Feeds')."</span>"; |
|
1226 | + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1227 | + print "<div onclick=\"CommonDialogs.quickAddFeed()\" |
|
1228 | 1228 | dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>"; |
1229 | - print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\" |
|
1229 | + print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\" |
|
1230 | 1230 | dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>"; |
1231 | - print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\" |
|
1231 | + print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\" |
|
1232 | 1232 | dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>"; |
1233 | - print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\" |
|
1233 | + print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\" |
|
1234 | 1234 | dojoType=\"dijit.MenuItem\">".__('Batch subscribe')."</div>"; |
1235 | - print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">" |
|
1236 | - .__('Unsubscribe')."</div> "; |
|
1237 | - print "</div></div>"; |
|
1238 | - |
|
1239 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
1240 | - print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1241 | - "<span>" . __('Categories')."</span>"; |
|
1242 | - print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1243 | - print "<div onclick=\"dijit.byId('feedTree').createCategory()\" |
|
1235 | + print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">" |
|
1236 | + .__('Unsubscribe')."</div> "; |
|
1237 | + print "</div></div>"; |
|
1238 | + |
|
1239 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
1240 | + print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1241 | + "<span>" . __('Categories')."</span>"; |
|
1242 | + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1243 | + print "<div onclick=\"dijit.byId('feedTree').createCategory()\" |
|
1244 | 1244 | dojoType=\"dijit.MenuItem\">".__('Add category')."</div>"; |
1245 | - print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\" |
|
1245 | + print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\" |
|
1246 | 1246 | dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>"; |
1247 | - print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\" |
|
1247 | + print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\" |
|
1248 | 1248 | dojoType=\"dijit.MenuItem\">".__('Remove selected')."</div>"; |
1249 | - print "</div></div>"; |
|
1249 | + print "</div></div>"; |
|
1250 | 1250 | |
1251 | - } |
|
1251 | + } |
|
1252 | 1252 | |
1253 | - print $error_button; |
|
1254 | - print $inactive_button; |
|
1253 | + print $error_button; |
|
1254 | + print $inactive_button; |
|
1255 | 1255 | |
1256 | - print "</div>"; # toolbar |
|
1256 | + print "</div>"; # toolbar |
|
1257 | 1257 | |
1258 | - //print '</div>'; |
|
1259 | - print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">'; |
|
1258 | + //print '</div>'; |
|
1259 | + print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">'; |
|
1260 | 1260 | |
1261 | - print "<div id=\"feedlistLoading\"> |
|
1261 | + print "<div id=\"feedlistLoading\"> |
|
1262 | 1262 | <img src='images/indicator_tiny.gif'>". |
1263 | - __("Loading, please wait...")."</div>"; |
|
1263 | + __("Loading, please wait...")."</div>"; |
|
1264 | 1264 | |
1265 | - $auto_expand = $feed_search != "" ? "true" : "false"; |
|
1265 | + $auto_expand = $feed_search != "" ? "true" : "false"; |
|
1266 | 1266 | |
1267 | - print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\" |
|
1267 | + print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\" |
|
1268 | 1268 | url=\"backend.php?op=pref-feeds&method=getfeedtree\"> |
1269 | 1269 | </div> |
1270 | 1270 | <div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"feedModel\" store=\"feedStore\" |
@@ -1297,23 +1297,23 @@ discard block |
||
1297 | 1297 | # ".__('<b>Hint:</b> you can drag feeds and categories around.')." |
1298 | 1298 | # </div>"; |
1299 | 1299 | |
1300 | - print '</div>'; |
|
1301 | - print '</div>'; |
|
1300 | + print '</div>'; |
|
1301 | + print '</div>'; |
|
1302 | 1302 | |
1303 | - print "</div>"; # feeds pane |
|
1303 | + print "</div>"; # feeds pane |
|
1304 | 1304 | |
1305 | - print "<div dojoType='dijit.layout.AccordionPane' |
|
1305 | + print "<div dojoType='dijit.layout.AccordionPane' |
|
1306 | 1306 | title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>"; |
1307 | 1307 | |
1308 | - print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>"; |
|
1308 | + print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>"; |
|
1309 | 1309 | |
1310 | - print_notice("Only main settings profile can be migrated using OPML."); |
|
1310 | + print_notice("Only main settings profile can be migrated using OPML."); |
|
1311 | 1311 | |
1312 | - print "<iframe id=\"upload_iframe\" |
|
1312 | + print "<iframe id=\"upload_iframe\" |
|
1313 | 1313 | name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\" |
1314 | 1314 | style=\"width: 400px; height: 100px; display: none;\"></iframe>"; |
1315 | 1315 | |
1316 | - print "<form name='opml_form' style='display : inline-block' target='upload_iframe' |
|
1316 | + print "<form name='opml_form' style='display : inline-block' target='upload_iframe' |
|
1317 | 1317 | enctype='multipart/form-data' method='POST' |
1318 | 1318 | action='backend.php'> |
1319 | 1319 | <label class='dijitButton'>".__("Choose file...")." |
@@ -1322,116 +1322,116 @@ discard block |
||
1322 | 1322 | <input type='hidden' name='op' value='dlg'> |
1323 | 1323 | <input type='hidden' name='method' value='importOpml'> |
1324 | 1324 | <button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" . |
1325 | - __('Import OPML') . "</button>"; |
|
1325 | + __('Import OPML') . "</button>"; |
|
1326 | 1326 | |
1327 | - print "</form>"; |
|
1327 | + print "</form>"; |
|
1328 | 1328 | |
1329 | - print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>"; |
|
1329 | + print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>"; |
|
1330 | 1330 | |
1331 | - print "<button dojoType='dijit.form.Button' |
|
1331 | + print "<button dojoType='dijit.form.Button' |
|
1332 | 1332 | onclick='Helpers.OPML.export()' >" . |
1333 | - __('Export OPML') . "</button>"; |
|
1333 | + __('Export OPML') . "</button>"; |
|
1334 | 1334 | |
1335 | - print " <label class='checkbox'>"; |
|
1336 | - print_checkbox("include_settings", true, "1", ""); |
|
1337 | - print " " . __("Include settings"); |
|
1338 | - print "</label>"; |
|
1335 | + print " <label class='checkbox'>"; |
|
1336 | + print_checkbox("include_settings", true, "1", ""); |
|
1337 | + print " " . __("Include settings"); |
|
1338 | + print "</label>"; |
|
1339 | 1339 | |
1340 | - print "</form>"; |
|
1340 | + print "</form>"; |
|
1341 | 1341 | |
1342 | - print "<p/>"; |
|
1342 | + print "<p/>"; |
|
1343 | 1343 | |
1344 | - print "<h2>" . __("Published OPML") . "</h2>"; |
|
1344 | + print "<h2>" . __("Published OPML") . "</h2>"; |
|
1345 | 1345 | |
1346 | - print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . |
|
1347 | - " " . |
|
1348 | - __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>"; |
|
1346 | + print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . |
|
1347 | + " " . |
|
1348 | + __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>"; |
|
1349 | 1349 | |
1350 | - print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">". |
|
1351 | - __('Display published OPML URL')."</button> "; |
|
1350 | + print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">". |
|
1351 | + __('Display published OPML URL')."</button> "; |
|
1352 | 1352 | |
1353 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
1354 | - "hook_prefs_tab_section", "prefFeedsOPML"); |
|
1353 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
1354 | + "hook_prefs_tab_section", "prefFeedsOPML"); |
|
1355 | 1355 | |
1356 | - print "</div>"; # pane |
|
1356 | + print "</div>"; # pane |
|
1357 | 1357 | |
1358 | - print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
1358 | + print "<div dojoType=\"dijit.layout.AccordionPane\" |
|
1359 | 1359 | title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">"; |
1360 | 1360 | |
1361 | - print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>"; |
|
1361 | + print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>"; |
|
1362 | 1362 | |
1363 | - $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . |
|
1364 | - "/public.php?op=rss&id=-2&view-mode=all_articles");; |
|
1363 | + $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . |
|
1364 | + "/public.php?op=rss&id=-2&view-mode=all_articles");; |
|
1365 | 1365 | |
1366 | - print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">". |
|
1367 | - __('Display URL')."</button> "; |
|
1366 | + print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">". |
|
1367 | + __('Display URL')."</button> "; |
|
1368 | 1368 | |
1369 | - print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">". |
|
1370 | - __('Clear all generated URLs')."</button> "; |
|
1369 | + print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">". |
|
1370 | + __('Clear all generated URLs')."</button> "; |
|
1371 | 1371 | |
1372 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
1373 | - "hook_prefs_tab_section", "prefFeedsPublishedGenerated"); |
|
1372 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
1373 | + "hook_prefs_tab_section", "prefFeedsPublishedGenerated"); |
|
1374 | 1374 | |
1375 | - print "</div>"; #pane |
|
1375 | + print "</div>"; #pane |
|
1376 | 1376 | |
1377 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
1378 | - "hook_prefs_tab", "prefFeeds"); |
|
1377 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
1378 | + "hook_prefs_tab", "prefFeeds"); |
|
1379 | 1379 | |
1380 | - print "</div>"; #container |
|
1381 | - } |
|
1380 | + print "</div>"; #container |
|
1381 | + } |
|
1382 | 1382 | |
1383 | - private function feedlist_init_cat($cat_id) { |
|
1384 | - $obj = array(); |
|
1385 | - $cat_id = (int) $cat_id; |
|
1383 | + private function feedlist_init_cat($cat_id) { |
|
1384 | + $obj = array(); |
|
1385 | + $cat_id = (int) $cat_id; |
|
1386 | 1386 | |
1387 | - if ($cat_id > 0) { |
|
1388 | - $cat_unread = CCache::find($cat_id, $_SESSION["uid"], true); |
|
1389 | - } else if ($cat_id == 0 || $cat_id == -2) { |
|
1390 | - $cat_unread = Feeds::getCategoryUnread($cat_id); |
|
1391 | - } |
|
1387 | + if ($cat_id > 0) { |
|
1388 | + $cat_unread = CCache::find($cat_id, $_SESSION["uid"], true); |
|
1389 | + } else if ($cat_id == 0 || $cat_id == -2) { |
|
1390 | + $cat_unread = Feeds::getCategoryUnread($cat_id); |
|
1391 | + } |
|
1392 | 1392 | |
1393 | - $obj['id'] = 'CAT:' . $cat_id; |
|
1394 | - $obj['items'] = array(); |
|
1395 | - $obj['name'] = Feeds::getCategoryTitle($cat_id); |
|
1396 | - $obj['type'] = 'category'; |
|
1397 | - $obj['unread'] = (int) $cat_unread; |
|
1398 | - $obj['bare_id'] = $cat_id; |
|
1393 | + $obj['id'] = 'CAT:' . $cat_id; |
|
1394 | + $obj['items'] = array(); |
|
1395 | + $obj['name'] = Feeds::getCategoryTitle($cat_id); |
|
1396 | + $obj['type'] = 'category'; |
|
1397 | + $obj['unread'] = (int) $cat_unread; |
|
1398 | + $obj['bare_id'] = $cat_id; |
|
1399 | 1399 | |
1400 | - return $obj; |
|
1401 | - } |
|
1400 | + return $obj; |
|
1401 | + } |
|
1402 | 1402 | |
1403 | - private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') { |
|
1404 | - $obj = array(); |
|
1405 | - $feed_id = (int) $feed_id; |
|
1403 | + private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') { |
|
1404 | + $obj = array(); |
|
1405 | + $feed_id = (int) $feed_id; |
|
1406 | 1406 | |
1407 | - if (!$title) |
|
1408 | - $title = Feeds::getFeedTitle($feed_id, false); |
|
1407 | + if (!$title) |
|
1408 | + $title = Feeds::getFeedTitle($feed_id, false); |
|
1409 | 1409 | |
1410 | - if ($unread === false) |
|
1411 | - $unread = getFeedUnread($feed_id, false); |
|
1410 | + if ($unread === false) |
|
1411 | + $unread = getFeedUnread($feed_id, false); |
|
1412 | 1412 | |
1413 | - $obj['id'] = 'FEED:' . $feed_id; |
|
1414 | - $obj['name'] = $title; |
|
1415 | - $obj['unread'] = (int) $unread; |
|
1416 | - $obj['type'] = 'feed'; |
|
1417 | - $obj['error'] = $error; |
|
1418 | - $obj['updated'] = $updated; |
|
1419 | - $obj['icon'] = Feeds::getFeedIcon($feed_id); |
|
1420 | - $obj['bare_id'] = $feed_id; |
|
1421 | - $obj['auxcounter'] = 0; |
|
1413 | + $obj['id'] = 'FEED:' . $feed_id; |
|
1414 | + $obj['name'] = $title; |
|
1415 | + $obj['unread'] = (int) $unread; |
|
1416 | + $obj['type'] = 'feed'; |
|
1417 | + $obj['error'] = $error; |
|
1418 | + $obj['updated'] = $updated; |
|
1419 | + $obj['icon'] = Feeds::getFeedIcon($feed_id); |
|
1420 | + $obj['bare_id'] = $feed_id; |
|
1421 | + $obj['auxcounter'] = 0; |
|
1422 | 1422 | |
1423 | - return $obj; |
|
1424 | - } |
|
1423 | + return $obj; |
|
1424 | + } |
|
1425 | 1425 | |
1426 | - public function inactiveFeeds() { |
|
1426 | + public function inactiveFeeds() { |
|
1427 | 1427 | |
1428 | - if (DB_TYPE == "pgsql") { |
|
1429 | - $interval_qpart = "NOW() - INTERVAL '3 months'"; |
|
1430 | - } else { |
|
1431 | - $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; |
|
1432 | - } |
|
1428 | + if (DB_TYPE == "pgsql") { |
|
1429 | + $interval_qpart = "NOW() - INTERVAL '3 months'"; |
|
1430 | + } else { |
|
1431 | + $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; |
|
1432 | + } |
|
1433 | 1433 | |
1434 | - $sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url, |
|
1434 | + $sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url, |
|
1435 | 1435 | ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article |
1436 | 1436 | FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE |
1437 | 1437 | (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE |
@@ -1442,356 +1442,356 @@ discard block |
||
1442 | 1442 | ttrss_entries.id = ref_id |
1443 | 1443 | GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url |
1444 | 1444 | ORDER BY last_article"); |
1445 | - $sth->execute([$_SESSION['uid']]); |
|
1445 | + $sth->execute([$_SESSION['uid']]); |
|
1446 | 1446 | |
1447 | - print "<div dojoType='fox.Toolbar'>"; |
|
1448 | - print "<div dojoType='fox.form.DropDownButton'>". |
|
1449 | - "<span>" . __('Select')."</span>"; |
|
1450 | - print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
1451 | - print "<div onclick=\"Tables.select('inactive-feeds-list', true)\" |
|
1447 | + print "<div dojoType='fox.Toolbar'>"; |
|
1448 | + print "<div dojoType='fox.form.DropDownButton'>". |
|
1449 | + "<span>" . __('Select')."</span>"; |
|
1450 | + print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
1451 | + print "<div onclick=\"Tables.select('inactive-feeds-list', true)\" |
|
1452 | 1452 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
1453 | - print "<div onclick=\"Tables.select('inactive-feeds-list', false)\" |
|
1453 | + print "<div onclick=\"Tables.select('inactive-feeds-list', false)\" |
|
1454 | 1454 | dojoType='dijit.MenuItem'>".__('None')."</div>"; |
1455 | - print "</div></div>"; |
|
1456 | - print "</div>"; #toolbar |
|
1455 | + print "</div></div>"; |
|
1456 | + print "</div>"; #toolbar |
|
1457 | 1457 | |
1458 | - print "<div class='panel panel-scrollable'>"; |
|
1459 | - print "<table width='100%' id='inactive-feeds-list'>"; |
|
1458 | + print "<div class='panel panel-scrollable'>"; |
|
1459 | + print "<table width='100%' id='inactive-feeds-list'>"; |
|
1460 | 1460 | |
1461 | - $lnum = 1; |
|
1461 | + $lnum = 1; |
|
1462 | 1462 | |
1463 | - while ($line = $sth->fetch()) { |
|
1463 | + while ($line = $sth->fetch()) { |
|
1464 | 1464 | |
1465 | - $feed_id = $line["id"]; |
|
1465 | + $feed_id = $line["id"]; |
|
1466 | 1466 | |
1467 | - print "<tr data-row-id='$feed_id'>"; |
|
1467 | + print "<tr data-row-id='$feed_id'>"; |
|
1468 | 1468 | |
1469 | - print "<td width='5%' align='center'><input |
|
1469 | + print "<td width='5%' align='center'><input |
|
1470 | 1470 | onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' |
1471 | 1471 | type='checkbox'></td>"; |
1472 | - print "<td>"; |
|
1472 | + print "<td>"; |
|
1473 | 1473 | |
1474 | - print "<a href='#' ". |
|
1475 | - "title=\"".__("Click to edit feed")."\" ". |
|
1476 | - "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". |
|
1477 | - htmlspecialchars($line["title"])."</a>"; |
|
1474 | + print "<a href='#' ". |
|
1475 | + "title=\"".__("Click to edit feed")."\" ". |
|
1476 | + "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". |
|
1477 | + htmlspecialchars($line["title"])."</a>"; |
|
1478 | 1478 | |
1479 | - print "</td><td class='text-muted' align='right'>"; |
|
1480 | - print make_local_datetime($line['last_article'], false); |
|
1481 | - print "</td>"; |
|
1482 | - print "</tr>"; |
|
1479 | + print "</td><td class='text-muted' align='right'>"; |
|
1480 | + print make_local_datetime($line['last_article'], false); |
|
1481 | + print "</td>"; |
|
1482 | + print "</tr>"; |
|
1483 | 1483 | |
1484 | - ++$lnum; |
|
1485 | - } |
|
1484 | + ++$lnum; |
|
1485 | + } |
|
1486 | 1486 | |
1487 | - print "</table>"; |
|
1488 | - print "</div>"; |
|
1487 | + print "</table>"; |
|
1488 | + print "</div>"; |
|
1489 | 1489 | |
1490 | - print "<footer> |
|
1490 | + print "<footer> |
|
1491 | 1491 | <button style='float : left' class=\"alt-danger\" dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">" |
1492 | - .__('Unsubscribe from selected feeds')."</button> |
|
1492 | + .__('Unsubscribe from selected feeds')."</button> |
|
1493 | 1493 | <button dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">" |
1494 | - .__('Close this window')."</button> |
|
1494 | + .__('Close this window')."</button> |
|
1495 | 1495 | </footer>"; |
1496 | 1496 | |
1497 | - } |
|
1497 | + } |
|
1498 | 1498 | |
1499 | - public function feedsWithErrors() { |
|
1500 | - $sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url |
|
1499 | + public function feedsWithErrors() { |
|
1500 | + $sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url |
|
1501 | 1501 | FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?"); |
1502 | - $sth->execute([$_SESSION['uid']]); |
|
1502 | + $sth->execute([$_SESSION['uid']]); |
|
1503 | 1503 | |
1504 | - print "<div dojoType=\"fox.Toolbar\">"; |
|
1505 | - print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1506 | - "<span>" . __('Select')."</span>"; |
|
1507 | - print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1508 | - print "<div onclick=\"Tables.select('error-feeds-list', true)\" |
|
1504 | + print "<div dojoType=\"fox.Toolbar\">"; |
|
1505 | + print "<div dojoType=\"fox.form.DropDownButton\">". |
|
1506 | + "<span>" . __('Select')."</span>"; |
|
1507 | + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
|
1508 | + print "<div onclick=\"Tables.select('error-feeds-list', true)\" |
|
1509 | 1509 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
1510 | - print "<div onclick=\"Tables.select('error-feeds-list', false)\" |
|
1510 | + print "<div onclick=\"Tables.select('error-feeds-list', false)\" |
|
1511 | 1511 | dojoType=\"dijit.MenuItem\">".__('None')."</div>"; |
1512 | - print "</div></div>"; |
|
1513 | - print "</div>"; #toolbar |
|
1512 | + print "</div></div>"; |
|
1513 | + print "</div>"; #toolbar |
|
1514 | 1514 | |
1515 | - print "<div class='panel panel-scrollable'>"; |
|
1516 | - print "<table width='100%' id='error-feeds-list'>"; |
|
1515 | + print "<div class='panel panel-scrollable'>"; |
|
1516 | + print "<table width='100%' id='error-feeds-list'>"; |
|
1517 | 1517 | |
1518 | - $lnum = 1; |
|
1518 | + $lnum = 1; |
|
1519 | 1519 | |
1520 | - while ($line = $sth->fetch()) { |
|
1520 | + while ($line = $sth->fetch()) { |
|
1521 | 1521 | |
1522 | - $feed_id = $line["id"]; |
|
1522 | + $feed_id = $line["id"]; |
|
1523 | 1523 | |
1524 | - print "<tr data-row-id='$feed_id'>"; |
|
1524 | + print "<tr data-row-id='$feed_id'>"; |
|
1525 | 1525 | |
1526 | - print "<td width='5%' align='center'><input |
|
1526 | + print "<td width='5%' align='center'><input |
|
1527 | 1527 | onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\" |
1528 | 1528 | type=\"checkbox\"></td>"; |
1529 | - print "<td>"; |
|
1529 | + print "<td>"; |
|
1530 | 1530 | |
1531 | - print "<a class=\"visibleLink\" href=\"#\" ". |
|
1532 | - "title=\"".__("Click to edit feed")."\" ". |
|
1533 | - "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". |
|
1534 | - htmlspecialchars($line["title"])."</a>: "; |
|
1531 | + print "<a class=\"visibleLink\" href=\"#\" ". |
|
1532 | + "title=\"".__("Click to edit feed")."\" ". |
|
1533 | + "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". |
|
1534 | + htmlspecialchars($line["title"])."</a>: "; |
|
1535 | 1535 | |
1536 | - print "<span class=\"text-muted\">"; |
|
1537 | - print htmlspecialchars($line["last_error"]); |
|
1538 | - print "</span>"; |
|
1536 | + print "<span class=\"text-muted\">"; |
|
1537 | + print htmlspecialchars($line["last_error"]); |
|
1538 | + print "</span>"; |
|
1539 | 1539 | |
1540 | - print "</td>"; |
|
1541 | - print "</tr>"; |
|
1540 | + print "</td>"; |
|
1541 | + print "</tr>"; |
|
1542 | 1542 | |
1543 | - ++$lnum; |
|
1544 | - } |
|
1543 | + ++$lnum; |
|
1544 | + } |
|
1545 | 1545 | |
1546 | - print "</table>"; |
|
1547 | - print "</div>"; |
|
1546 | + print "</table>"; |
|
1547 | + print "</div>"; |
|
1548 | 1548 | |
1549 | - print "<footer>"; |
|
1550 | - print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">" |
|
1551 | - .__('Unsubscribe from selected feeds')."</button> "; |
|
1549 | + print "<footer>"; |
|
1550 | + print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">" |
|
1551 | + .__('Unsubscribe from selected feeds')."</button> "; |
|
1552 | 1552 | |
1553 | - print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">". |
|
1554 | - __('Close this window')."</button>"; |
|
1553 | + print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">". |
|
1554 | + __('Close this window')."</button>"; |
|
1555 | 1555 | |
1556 | - print "</footer>"; |
|
1557 | - } |
|
1556 | + print "</footer>"; |
|
1557 | + } |
|
1558 | 1558 | |
1559 | - private function remove_feed_category($id, $owner_uid) { |
|
1559 | + private function remove_feed_category($id, $owner_uid) { |
|
1560 | 1560 | |
1561 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories |
|
1561 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories |
|
1562 | 1562 | WHERE id = ? AND owner_uid = ?"); |
1563 | - $sth->execute([$id, $owner_uid]); |
|
1563 | + $sth->execute([$id, $owner_uid]); |
|
1564 | 1564 | |
1565 | - CCache::remove($id, $owner_uid, true); |
|
1566 | - } |
|
1565 | + CCache::remove($id, $owner_uid, true); |
|
1566 | + } |
|
1567 | 1567 | |
1568 | - public static function remove_feed($id, $owner_uid) { |
|
1569 | - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) { |
|
1570 | - if (! $p->hook_unsubscribe_feed($id, $owner_uid)) { |
|
1568 | + public static function remove_feed($id, $owner_uid) { |
|
1569 | + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) { |
|
1570 | + if (! $p->hook_unsubscribe_feed($id, $owner_uid)) { |
|
1571 | 1571 | user_error("feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING); |
1572 | 1572 | return; |
1573 | - } |
|
1574 | - } |
|
1573 | + } |
|
1574 | + } |
|
1575 | 1575 | |
1576 | - $pdo = Db::pdo(); |
|
1576 | + $pdo = Db::pdo(); |
|
1577 | 1577 | |
1578 | - if ($id > 0) { |
|
1579 | - $pdo->beginTransaction(); |
|
1578 | + if ($id > 0) { |
|
1579 | + $pdo->beginTransaction(); |
|
1580 | 1580 | |
1581 | - /* save starred articles in Archived feed */ |
|
1581 | + /* save starred articles in Archived feed */ |
|
1582 | 1582 | |
1583 | - /* prepare feed if necessary */ |
|
1583 | + /* prepare feed if necessary */ |
|
1584 | 1584 | |
1585 | - $sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ? |
|
1585 | + $sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ? |
|
1586 | 1586 | AND owner_uid = ?"); |
1587 | - $sth->execute([$id, $owner_uid]); |
|
1587 | + $sth->execute([$id, $owner_uid]); |
|
1588 | 1588 | |
1589 | - if ($row = $sth->fetch()) { |
|
1590 | - $feed_url = $row["feed_url"]; |
|
1589 | + if ($row = $sth->fetch()) { |
|
1590 | + $feed_url = $row["feed_url"]; |
|
1591 | 1591 | |
1592 | - $sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds |
|
1592 | + $sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds |
|
1593 | 1593 | WHERE feed_url = ? AND owner_uid = ?"); |
1594 | - $sth->execute([$feed_url, $owner_uid]); |
|
1594 | + $sth->execute([$feed_url, $owner_uid]); |
|
1595 | 1595 | |
1596 | - if ($row = $sth->fetch()) { |
|
1597 | - $archive_id = $row["id"]; |
|
1598 | - } else { |
|
1599 | - $res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds"); |
|
1600 | - $row = $res->fetch(); |
|
1596 | + if ($row = $sth->fetch()) { |
|
1597 | + $archive_id = $row["id"]; |
|
1598 | + } else { |
|
1599 | + $res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds"); |
|
1600 | + $row = $res->fetch(); |
|
1601 | 1601 | |
1602 | - $new_feed_id = (int)$row['id'] + 1; |
|
1602 | + $new_feed_id = (int)$row['id'] + 1; |
|
1603 | 1603 | |
1604 | - $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds |
|
1604 | + $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds |
|
1605 | 1605 | (id, owner_uid, title, feed_url, site_url, created) |
1606 | 1606 | SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds |
1607 | 1607 | WHERE id = ?"); |
1608 | - $sth->execute([$new_feed_id, $id]); |
|
1608 | + $sth->execute([$new_feed_id, $id]); |
|
1609 | 1609 | |
1610 | - $archive_id = $new_feed_id; |
|
1611 | - } |
|
1610 | + $archive_id = $new_feed_id; |
|
1611 | + } |
|
1612 | 1612 | |
1613 | - $sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL, |
|
1613 | + $sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL, |
|
1614 | 1614 | orig_feed_id = ? WHERE feed_id = ? AND |
1615 | 1615 | marked = true AND owner_uid = ?"); |
1616 | 1616 | |
1617 | - $sth->execute([$archive_id, $id, $owner_uid]); |
|
1617 | + $sth->execute([$archive_id, $id, $owner_uid]); |
|
1618 | 1618 | |
1619 | - /* Remove access key for the feed */ |
|
1619 | + /* Remove access key for the feed */ |
|
1620 | 1620 | |
1621 | - $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE |
|
1621 | + $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE |
|
1622 | 1622 | feed_id = ? AND owner_uid = ?"); |
1623 | - $sth->execute([$id, $owner_uid]); |
|
1623 | + $sth->execute([$id, $owner_uid]); |
|
1624 | 1624 | |
1625 | - /* remove the feed */ |
|
1625 | + /* remove the feed */ |
|
1626 | 1626 | |
1627 | - $sth = $pdo->prepare("DELETE FROM ttrss_feeds |
|
1627 | + $sth = $pdo->prepare("DELETE FROM ttrss_feeds |
|
1628 | 1628 | WHERE id = ? AND owner_uid = ?"); |
1629 | - $sth->execute([$id, $owner_uid]); |
|
1630 | - } |
|
1629 | + $sth->execute([$id, $owner_uid]); |
|
1630 | + } |
|
1631 | 1631 | |
1632 | - $pdo->commit(); |
|
1632 | + $pdo->commit(); |
|
1633 | 1633 | |
1634 | - if (file_exists(ICONS_DIR . "/$id.ico")) { |
|
1635 | - unlink(ICONS_DIR . "/$id.ico"); |
|
1636 | - } |
|
1634 | + if (file_exists(ICONS_DIR . "/$id.ico")) { |
|
1635 | + unlink(ICONS_DIR . "/$id.ico"); |
|
1636 | + } |
|
1637 | 1637 | |
1638 | - CCache::remove($id, $owner_uid); |
|
1638 | + CCache::remove($id, $owner_uid); |
|
1639 | 1639 | |
1640 | - } else { |
|
1641 | - Labels::remove(Labels::feed_to_label_id($id), $owner_uid); |
|
1642 | - //CCache::remove($id, $owner_uid); don't think labels are cached |
|
1643 | - } |
|
1644 | - } |
|
1640 | + } else { |
|
1641 | + Labels::remove(Labels::feed_to_label_id($id), $owner_uid); |
|
1642 | + //CCache::remove($id, $owner_uid); don't think labels are cached |
|
1643 | + } |
|
1644 | + } |
|
1645 | 1645 | |
1646 | - public function batchSubscribe() { |
|
1647 | - print_hidden("op", "pref-feeds"); |
|
1648 | - print_hidden("method", "batchaddfeeds"); |
|
1646 | + public function batchSubscribe() { |
|
1647 | + print_hidden("op", "pref-feeds"); |
|
1648 | + print_hidden("method", "batchaddfeeds"); |
|
1649 | 1649 | |
1650 | - print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>"; |
|
1651 | - print "<section>"; |
|
1650 | + print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>"; |
|
1651 | + print "<section>"; |
|
1652 | 1652 | |
1653 | - print "<textarea |
|
1653 | + print "<textarea |
|
1654 | 1654 | style='font-size : 12px; width : 98%; height: 200px;' |
1655 | 1655 | dojoType='dijit.form.SimpleTextarea' name='feeds'></textarea>"; |
1656 | 1656 | |
1657 | - if (get_pref('ENABLE_FEED_CATS')) { |
|
1658 | - print "<fieldset>"; |
|
1659 | - print "<label>" . __('Place in category:') . "</label> "; |
|
1660 | - print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"'); |
|
1661 | - print "</fieldset>"; |
|
1662 | - } |
|
1657 | + if (get_pref('ENABLE_FEED_CATS')) { |
|
1658 | + print "<fieldset>"; |
|
1659 | + print "<label>" . __('Place in category:') . "</label> "; |
|
1660 | + print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"'); |
|
1661 | + print "</fieldset>"; |
|
1662 | + } |
|
1663 | 1663 | |
1664 | - print "</section>"; |
|
1664 | + print "</section>"; |
|
1665 | 1665 | |
1666 | - print "<div id='feedDlg_loginContainer' style='display : none'>"; |
|
1666 | + print "<div id='feedDlg_loginContainer' style='display : none'>"; |
|
1667 | 1667 | |
1668 | - print "<header>" . __("Authentication") . "</header>"; |
|
1669 | - print "<section>"; |
|
1668 | + print "<header>" . __("Authentication") . "</header>"; |
|
1669 | + print "<section>"; |
|
1670 | 1670 | |
1671 | - print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\"> |
|
1671 | + print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\"> |
|
1672 | 1672 | <input placeHolder=\"".__("Password")."\" dojoType=\"dijit.form.TextBox\" type='password' |
1673 | 1673 | autocomplete='new-password' name='pass''></div>"; |
1674 | 1674 | |
1675 | - print "</section>"; |
|
1676 | - print "</div>"; |
|
1675 | + print "</section>"; |
|
1676 | + print "</div>"; |
|
1677 | 1677 | |
1678 | - print "<fieldset class='narrow'> |
|
1678 | + print "<fieldset class='narrow'> |
|
1679 | 1679 | <label class='checkbox'><input type='checkbox' name='need_auth' dojoType='dijit.form.CheckBox' |
1680 | 1680 | onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'> ". |
1681 | - __('Feeds require authentication.')."</label></div>"; |
|
1682 | - print "</fieldset>"; |
|
1681 | + __('Feeds require authentication.')."</label></div>"; |
|
1682 | + print "</fieldset>"; |
|
1683 | 1683 | |
1684 | - print "<footer> |
|
1684 | + print "<footer> |
|
1685 | 1685 | <button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__('Subscribe')."</button> |
1686 | 1686 | <button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button> |
1687 | 1687 | </footer>"; |
1688 | - } |
|
1688 | + } |
|
1689 | 1689 | |
1690 | - public function batchAddFeeds() { |
|
1691 | - $cat_id = clean($_REQUEST['cat']); |
|
1692 | - $feeds = explode("\n", clean($_REQUEST['feeds'])); |
|
1693 | - $login = clean($_REQUEST['login']); |
|
1694 | - $pass = trim(clean($_REQUEST['pass'])); |
|
1690 | + public function batchAddFeeds() { |
|
1691 | + $cat_id = clean($_REQUEST['cat']); |
|
1692 | + $feeds = explode("\n", clean($_REQUEST['feeds'])); |
|
1693 | + $login = clean($_REQUEST['login']); |
|
1694 | + $pass = trim(clean($_REQUEST['pass'])); |
|
1695 | 1695 | |
1696 | - $csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds |
|
1696 | + $csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds |
|
1697 | 1697 | WHERE feed_url = ? AND owner_uid = ?"); |
1698 | 1698 | |
1699 | - $isth = $this->pdo->prepare("INSERT INTO ttrss_feeds |
|
1699 | + $isth = $this->pdo->prepare("INSERT INTO ttrss_feeds |
|
1700 | 1700 | (owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted) |
1701 | 1701 | VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)"); |
1702 | 1702 | |
1703 | - foreach ($feeds as $feed) { |
|
1704 | - $feed = trim($feed); |
|
1703 | + foreach ($feeds as $feed) { |
|
1704 | + $feed = trim($feed); |
|
1705 | 1705 | |
1706 | - if (Feeds::validate_feed_url($feed)) { |
|
1706 | + if (Feeds::validate_feed_url($feed)) { |
|
1707 | 1707 | |
1708 | - $this->pdo->beginTransaction(); |
|
1708 | + $this->pdo->beginTransaction(); |
|
1709 | 1709 | |
1710 | - $csth->execute([$feed, $_SESSION['uid']]); |
|
1710 | + $csth->execute([$feed, $_SESSION['uid']]); |
|
1711 | 1711 | |
1712 | - if (!$csth->fetch()) { |
|
1713 | - $isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]); |
|
1714 | - } |
|
1712 | + if (!$csth->fetch()) { |
|
1713 | + $isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]); |
|
1714 | + } |
|
1715 | 1715 | |
1716 | - $this->pdo->commit(); |
|
1717 | - } |
|
1718 | - } |
|
1719 | - } |
|
1716 | + $this->pdo->commit(); |
|
1717 | + } |
|
1718 | + } |
|
1719 | + } |
|
1720 | 1720 | |
1721 | - public function regenOPMLKey() { |
|
1722 | - $this->update_feed_access_key('OPML:Publish', |
|
1723 | - false, $_SESSION["uid"]); |
|
1721 | + public function regenOPMLKey() { |
|
1722 | + $this->update_feed_access_key('OPML:Publish', |
|
1723 | + false, $_SESSION["uid"]); |
|
1724 | 1724 | |
1725 | - $new_link = Opml::opml_publish_url(); |
|
1725 | + $new_link = Opml::opml_publish_url(); |
|
1726 | 1726 | |
1727 | - print json_encode(array("link" => $new_link)); |
|
1728 | - } |
|
1727 | + print json_encode(array("link" => $new_link)); |
|
1728 | + } |
|
1729 | 1729 | |
1730 | - public function regenFeedKey() { |
|
1731 | - $feed_id = clean($_REQUEST['id']); |
|
1732 | - $is_cat = clean($_REQUEST['is_cat']); |
|
1730 | + public function regenFeedKey() { |
|
1731 | + $feed_id = clean($_REQUEST['id']); |
|
1732 | + $is_cat = clean($_REQUEST['is_cat']); |
|
1733 | 1733 | |
1734 | - $new_key = $this->update_feed_access_key($feed_id, $is_cat); |
|
1734 | + $new_key = $this->update_feed_access_key($feed_id, $is_cat); |
|
1735 | 1735 | |
1736 | - print json_encode(["link" => $new_key]); |
|
1737 | - } |
|
1736 | + print json_encode(["link" => $new_key]); |
|
1737 | + } |
|
1738 | 1738 | |
1739 | 1739 | |
1740 | - private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) { |
|
1741 | - if (!$owner_uid) $owner_uid = $_SESSION["uid"]; |
|
1740 | + private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) { |
|
1741 | + if (!$owner_uid) $owner_uid = $_SESSION["uid"]; |
|
1742 | 1742 | |
1743 | - // clear old value and generate new one |
|
1744 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys |
|
1743 | + // clear old value and generate new one |
|
1744 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys |
|
1745 | 1745 | WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?"); |
1746 | - $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]); |
|
1746 | + $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]); |
|
1747 | 1747 | |
1748 | - return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid); |
|
1749 | - } |
|
1748 | + return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid); |
|
1749 | + } |
|
1750 | 1750 | |
1751 | - // Silent |
|
1752 | - public function clearKeys() { |
|
1753 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE |
|
1751 | + // Silent |
|
1752 | + public function clearKeys() { |
|
1753 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE |
|
1754 | 1754 | owner_uid = ?"); |
1755 | - $sth->execute([$_SESSION['uid']]); |
|
1756 | - } |
|
1757 | - |
|
1758 | - private function calculate_children_count($cat) { |
|
1759 | - $c = 0; |
|
1760 | - |
|
1761 | - foreach ($cat['items'] as $child) { |
|
1762 | - if ($child['type'] == 'category') { |
|
1763 | - $c += $this->calculate_children_count($child); |
|
1764 | - } else { |
|
1765 | - $c += 1; |
|
1766 | - } |
|
1767 | - } |
|
1768 | - |
|
1769 | - return $c; |
|
1770 | - } |
|
1771 | - |
|
1772 | - public function getinactivefeeds() { |
|
1773 | - if (DB_TYPE == "pgsql") { |
|
1774 | - $interval_qpart = "NOW() - INTERVAL '3 months'"; |
|
1775 | - } else { |
|
1776 | - $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; |
|
1777 | - } |
|
1778 | - |
|
1779 | - $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE |
|
1755 | + $sth->execute([$_SESSION['uid']]); |
|
1756 | + } |
|
1757 | + |
|
1758 | + private function calculate_children_count($cat) { |
|
1759 | + $c = 0; |
|
1760 | + |
|
1761 | + foreach ($cat['items'] as $child) { |
|
1762 | + if ($child['type'] == 'category') { |
|
1763 | + $c += $this->calculate_children_count($child); |
|
1764 | + } else { |
|
1765 | + $c += 1; |
|
1766 | + } |
|
1767 | + } |
|
1768 | + |
|
1769 | + return $c; |
|
1770 | + } |
|
1771 | + |
|
1772 | + public function getinactivefeeds() { |
|
1773 | + if (DB_TYPE == "pgsql") { |
|
1774 | + $interval_qpart = "NOW() - INTERVAL '3 months'"; |
|
1775 | + } else { |
|
1776 | + $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; |
|
1777 | + } |
|
1778 | + |
|
1779 | + $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE |
|
1780 | 1780 | (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE |
1781 | 1781 | ttrss_entries.id = ref_id AND |
1782 | 1782 | ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND |
1783 | 1783 | ttrss_feeds.owner_uid = ?"); |
1784 | - $sth->execute([$_SESSION['uid']]); |
|
1785 | - |
|
1786 | - if ($row = $sth->fetch()) { |
|
1787 | - print (int)$row["num_inactive"]; |
|
1788 | - } |
|
1789 | - } |
|
1790 | - |
|
1791 | - public static function subscribe_to_feed_url() { |
|
1792 | - $url_path = get_self_url_prefix() . |
|
1793 | - "/public.php?op=subscribe&feed_url=%s"; |
|
1794 | - return $url_path; |
|
1795 | - } |
|
1784 | + $sth->execute([$_SESSION['uid']]); |
|
1785 | + |
|
1786 | + if ($row = $sth->fetch()) { |
|
1787 | + print (int)$row["num_inactive"]; |
|
1788 | + } |
|
1789 | + } |
|
1790 | + |
|
1791 | + public static function subscribe_to_feed_url() { |
|
1792 | + $url_path = get_self_url_prefix() . |
|
1793 | + "/public.php?op=subscribe&feed_url=%s"; |
|
1794 | + return $url_path; |
|
1795 | + } |
|
1796 | 1796 | |
1797 | 1797 | } |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | while ($line = $sth->fetch()) { |
61 | 61 | |
62 | 62 | $cat = array(); |
63 | - $cat['id'] = 'CAT:' . $line['id']; |
|
64 | - $cat['bare_id'] = (int)$line['id']; |
|
63 | + $cat['id'] = 'CAT:'.$line['id']; |
|
64 | + $cat['bare_id'] = (int) $line['id']; |
|
65 | 65 | $cat['name'] = $line['title']; |
66 | 66 | $cat['items'] = array(); |
67 | 67 | $cat['checkbox'] = false; |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | |
94 | 94 | while ($feed_line = $fsth->fetch()) { |
95 | 95 | $feed = array(); |
96 | - $feed['id'] = 'FEED:' . $feed_line['id']; |
|
97 | - $feed['bare_id'] = (int)$feed_line['id']; |
|
96 | + $feed['id'] = 'FEED:'.$feed_line['id']; |
|
97 | + $feed['bare_id'] = (int) $feed_line['id']; |
|
98 | 98 | $feed['auxcounter'] = -1; |
99 | 99 | $feed['name'] = $feed_line['title']; |
100 | 100 | $feed['checkbox'] = false; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); |
104 | 104 | $feed['param'] = make_local_datetime( |
105 | 105 | $feed_line['last_updated'], true); |
106 | - $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
106 | + $feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0); |
|
107 | 107 | |
108 | 108 | array_push($items, $feed); |
109 | 109 | } |
@@ -151,8 +151,8 @@ discard block |
||
151 | 151 | $feed_id = PluginHost::pfeed_to_feed_id($feed['id']); |
152 | 152 | |
153 | 153 | $item = array(); |
154 | - $item['id'] = 'FEED:' . $feed_id; |
|
155 | - $item['bare_id'] = (int)$feed_id; |
|
154 | + $item['id'] = 'FEED:'.$feed_id; |
|
155 | + $item['bare_id'] = (int) $feed_id; |
|
156 | 156 | $item['auxcounter'] = -1; |
157 | 157 | $item['name'] = $feed['title']; |
158 | 158 | $item['checkbox'] = false; |
@@ -216,8 +216,8 @@ discard block |
||
216 | 216 | |
217 | 217 | while ($line = $sth->fetch()) { |
218 | 218 | $cat = array(); |
219 | - $cat['id'] = 'CAT:' . $line['id']; |
|
220 | - $cat['bare_id'] = (int)$line['id']; |
|
219 | + $cat['id'] = 'CAT:'.$line['id']; |
|
220 | + $cat['bare_id'] = (int) $line['id']; |
|
221 | 221 | $cat['auxcounter'] = -1; |
222 | 222 | $cat['name'] = $line['title']; |
223 | 223 | $cat['items'] = array(); |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | |
262 | 262 | while ($feed_line = $fsth->fetch()) { |
263 | 263 | $feed = array(); |
264 | - $feed['id'] = 'FEED:' . $feed_line['id']; |
|
265 | - $feed['bare_id'] = (int)$feed_line['id']; |
|
264 | + $feed['id'] = 'FEED:'.$feed_line['id']; |
|
265 | + $feed['bare_id'] = (int) $feed_line['id']; |
|
266 | 266 | $feed['auxcounter'] = -1; |
267 | 267 | $feed['name'] = $feed_line['title']; |
268 | 268 | $feed['checkbox'] = false; |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $feed_line['last_updated'], true); |
273 | 273 | $feed['unread'] = -1; |
274 | 274 | $feed['type'] = 'feed'; |
275 | - $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
275 | + $feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0); |
|
276 | 276 | |
277 | 277 | array_push($cat['items'], $feed); |
278 | 278 | } |
@@ -296,8 +296,8 @@ discard block |
||
296 | 296 | |
297 | 297 | while ($feed_line = $fsth->fetch()) { |
298 | 298 | $feed = array(); |
299 | - $feed['id'] = 'FEED:' . $feed_line['id']; |
|
300 | - $feed['bare_id'] = (int)$feed_line['id']; |
|
299 | + $feed['id'] = 'FEED:'.$feed_line['id']; |
|
300 | + $feed['bare_id'] = (int) $feed_line['id']; |
|
301 | 301 | $feed['auxcounter'] = -1; |
302 | 302 | $feed['name'] = $feed_line['title']; |
303 | 303 | $feed['checkbox'] = false; |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | $feed_line['last_updated'], true); |
308 | 308 | $feed['unread'] = -1; |
309 | 309 | $feed['type'] = 'feed'; |
310 | - $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); |
|
310 | + $feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0); |
|
311 | 311 | |
312 | 312 | array_push($root['items'], $feed); |
313 | 313 | } |
@@ -348,11 +348,11 @@ discard block |
||
348 | 348 | |
349 | 349 | Debug::log("$prefix C: $item_id P: $parent_id"); |
350 | 350 | |
351 | - $bare_item_id = substr($item_id, strpos($item_id, ':')+1); |
|
351 | + $bare_item_id = substr($item_id, strpos($item_id, ':') + 1); |
|
352 | 352 | |
353 | 353 | if ($item_id != 'root') { |
354 | 354 | if ($parent_id && $parent_id != 'root') { |
355 | - $parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1); |
|
355 | + $parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1); |
|
356 | 356 | $parent_qpart = $parent_bare_id; |
357 | 357 | } else { |
358 | 358 | $parent_qpart = null; |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | if ($cat && is_array($cat)) { |
372 | 372 | foreach ($cat as $item) { |
373 | 373 | $id = $item['_reference']; |
374 | - $bare_id = substr($id, strpos($id, ':')+1); |
|
374 | + $bare_id = substr($id, strpos($id, ':') + 1); |
|
375 | 375 | |
376 | 376 | Debug::log("$prefix [$order_id] $id/$bare_id"); |
377 | 377 | |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | |
390 | 390 | } else if (strpos($id, "CAT:") === 0) { |
391 | 391 | $this->process_category_order($data_map, $item['_reference'], $item_id, |
392 | - $nest_level+1); |
|
392 | + $nest_level + 1); |
|
393 | 393 | |
394 | 394 | $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories |
395 | 395 | SET order_id = ? WHERE id = ? AND |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | $sth->execute([$feed_id, $_SESSION['uid']]); |
447 | 447 | |
448 | 448 | if ($sth->fetch()) { |
449 | - @unlink(ICONS_DIR . "/$feed_id.ico"); |
|
449 | + @unlink(ICONS_DIR."/$feed_id.ico"); |
|
450 | 450 | |
451 | 451 | $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?"); |
452 | 452 | $sth->execute([$feed_id]); |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | header("Content-type: text/html"); |
458 | 458 | |
459 | 459 | if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) { |
460 | - $tmp_file = tempnam(CACHE_DIR . '/upload', 'icon'); |
|
460 | + $tmp_file = tempnam(CACHE_DIR.'/upload', 'icon'); |
|
461 | 461 | |
462 | 462 | $result = move_uploaded_file($_FILES['icon_file']['tmp_name'], |
463 | 463 | $tmp_file); |
@@ -480,8 +480,8 @@ discard block |
||
480 | 480 | $sth->execute([$feed_id, $_SESSION['uid']]); |
481 | 481 | |
482 | 482 | if ($sth->fetch()) { |
483 | - @unlink(ICONS_DIR . "/$feed_id.ico"); |
|
484 | - if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) { |
|
483 | + @unlink(ICONS_DIR."/$feed_id.ico"); |
|
484 | + if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) { |
|
485 | 485 | |
486 | 486 | $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?"); |
487 | 487 | $sth->execute([$feed_id]); |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | |
541 | 541 | print "<fieldset>"; |
542 | 542 | |
543 | - print "<label>" . __('URL:') . "</label> "; |
|
543 | + print "<label>".__('URL:')."</label> "; |
|
544 | 544 | print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
545 | 545 | placeHolder=\"".__("Feed URL")."\" |
546 | 546 | regExp='^(http|https)://.*' style='width : 300px' |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | |
564 | 564 | print "<fieldset>"; |
565 | 565 | |
566 | - print "<label>" . __('Place in category:') . "</label> "; |
|
566 | + print "<label>".__('Place in category:')."</label> "; |
|
567 | 567 | |
568 | 568 | print_feed_cat_select("cat_id", $cat_id, |
569 | 569 | 'dojoType="fox.form.Select"'); |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | |
578 | 578 | print "<fieldset>"; |
579 | 579 | |
580 | - print "<label>" . __('Site URL:') . "</label> "; |
|
580 | + print "<label>".__('Site URL:')."</label> "; |
|
581 | 581 | print "<input dojoType='dijit.form.ValidationTextBox' required='1' |
582 | 582 | placeHolder=\"".__("Site URL")."\" |
583 | 583 | regExp='^(http|https)://.*' style='width : 300px' |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | |
596 | 596 | print "<fieldset>"; |
597 | 597 | |
598 | - print "<label>" . __('Language:') . "</label> "; |
|
598 | + print "<label>".__('Language:')."</label> "; |
|
599 | 599 | print_select("feed_language", $feed_language, $this::get_ts_languages(), |
600 | 600 | 'dojoType="fox.form.Select"'); |
601 | 601 | |
@@ -626,10 +626,10 @@ discard block |
||
626 | 626 | |
627 | 627 | print "<fieldset>"; |
628 | 628 | |
629 | - print "<label>" . __('Article purging:') . "</label> "; |
|
629 | + print "<label>".__('Article purging:')."</label> "; |
|
630 | 630 | |
631 | 631 | print_select_hash("purge_interval", $purge_interval, $purge_intervals, |
632 | - 'dojoType="fox.form.Select" ' . |
|
632 | + 'dojoType="fox.form.Select" '. |
|
633 | 633 | ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"')); |
634 | 634 | |
635 | 635 | print "</fieldset>"; |
@@ -736,7 +736,7 @@ discard block |
||
736 | 736 | print "<fieldset class='narrow'>"; |
737 | 737 | |
738 | 738 | print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images' |
739 | - name='cache_images' $checked> ". __('Cache media')."</label>"; |
|
739 | + name='cache_images' $checked> ".__('Cache media')."</label>"; |
|
740 | 740 | |
741 | 741 | print "</fieldset>"; |
742 | 742 | |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | |
819 | 819 | print "<fieldset>"; |
820 | 820 | |
821 | - print "<label>" . __('Place in category:') . "</label> "; |
|
821 | + print "<label>".__('Place in category:')."</label> "; |
|
822 | 822 | |
823 | 823 | print_feed_cat_select("cat_id", false, |
824 | 824 | 'disabled="1" dojoType="fox.form.Select"'); |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | if (DB_TYPE == "pgsql") { |
834 | 834 | print "<fieldset>"; |
835 | 835 | |
836 | - print "<label>" . __('Language:') . "</label> "; |
|
836 | + print "<label>".__('Language:')."</label> "; |
|
837 | 837 | print_select("feed_language", "", $this::get_ts_languages(), |
838 | 838 | 'disabled="1" dojoType="fox.form.Select"'); |
839 | 839 | |
@@ -866,7 +866,7 @@ discard block |
||
866 | 866 | |
867 | 867 | print "<fieldset>"; |
868 | 868 | |
869 | - print "<label>" . __('Article purging:') . "</label> "; |
|
869 | + print "<label>".__('Article purging:')."</label> "; |
|
870 | 870 | |
871 | 871 | print_select_hash("purge_interval", "", $purge_intervals, |
872 | 872 | 'disabled="1" dojoType="fox.form.Select"'); |
@@ -1026,12 +1026,12 @@ discard block |
||
1026 | 1026 | ":purge_intl" => $purge_intl, |
1027 | 1027 | ":auth_login" => $auth_login, |
1028 | 1028 | ":auth_pass" => $auth_pass, |
1029 | - ":private" => (int)$private, |
|
1030 | - ":cache_images" => (int)$cache_images, |
|
1031 | - ":hide_images" => (int)$hide_images, |
|
1032 | - ":include_in_digest" => (int)$include_in_digest, |
|
1033 | - ":always_display_enclosures" => (int)$always_display_enclosures, |
|
1034 | - ":mark_unread_on_update" => (int)$mark_unread_on_update, |
|
1029 | + ":private" => (int) $private, |
|
1030 | + ":cache_images" => (int) $cache_images, |
|
1031 | + ":hide_images" => (int) $hide_images, |
|
1032 | + ":include_in_digest" => (int) $include_in_digest, |
|
1033 | + ":always_display_enclosures" => (int) $always_display_enclosures, |
|
1034 | + ":mark_unread_on_update" => (int) $mark_unread_on_update, |
|
1035 | 1035 | ":feed_language" => $feed_language, |
1036 | 1036 | ":id" => $feed_id, |
1037 | 1037 | ":uid" => $_SESSION['uid']]); |
@@ -1062,57 +1062,57 @@ discard block |
||
1062 | 1062 | |
1063 | 1063 | switch ($k) { |
1064 | 1064 | case "title": |
1065 | - $qpart = "title = " . $this->pdo->quote($feed_title); |
|
1065 | + $qpart = "title = ".$this->pdo->quote($feed_title); |
|
1066 | 1066 | break; |
1067 | 1067 | |
1068 | 1068 | case "feed_url": |
1069 | - $qpart = "feed_url = " . $this->pdo->quote($feed_url); |
|
1069 | + $qpart = "feed_url = ".$this->pdo->quote($feed_url); |
|
1070 | 1070 | break; |
1071 | 1071 | |
1072 | 1072 | case "update_interval": |
1073 | - $qpart = "update_interval = " . $this->pdo->quote($upd_intl); |
|
1073 | + $qpart = "update_interval = ".$this->pdo->quote($upd_intl); |
|
1074 | 1074 | break; |
1075 | 1075 | |
1076 | 1076 | case "purge_interval": |
1077 | - $qpart = "purge_interval =" . $this->pdo->quote($purge_intl); |
|
1077 | + $qpart = "purge_interval =".$this->pdo->quote($purge_intl); |
|
1078 | 1078 | break; |
1079 | 1079 | |
1080 | 1080 | case "auth_login": |
1081 | - $qpart = "auth_login = " . $this->pdo->quote($auth_login); |
|
1081 | + $qpart = "auth_login = ".$this->pdo->quote($auth_login); |
|
1082 | 1082 | break; |
1083 | 1083 | |
1084 | 1084 | case "auth_pass": |
1085 | - $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false"; |
|
1085 | + $qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false"; |
|
1086 | 1086 | break; |
1087 | 1087 | |
1088 | 1088 | case "private": |
1089 | - $qpart = "private = " . $this->pdo->quote($private); |
|
1089 | + $qpart = "private = ".$this->pdo->quote($private); |
|
1090 | 1090 | break; |
1091 | 1091 | |
1092 | 1092 | case "include_in_digest": |
1093 | - $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest); |
|
1093 | + $qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest); |
|
1094 | 1094 | break; |
1095 | 1095 | |
1096 | 1096 | case "always_display_enclosures": |
1097 | - $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures); |
|
1097 | + $qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures); |
|
1098 | 1098 | break; |
1099 | 1099 | |
1100 | 1100 | case "mark_unread_on_update": |
1101 | - $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update); |
|
1101 | + $qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update); |
|
1102 | 1102 | break; |
1103 | 1103 | |
1104 | 1104 | case "cache_images": |
1105 | - $qpart = "cache_images = " . $this->pdo->quote($cache_images); |
|
1105 | + $qpart = "cache_images = ".$this->pdo->quote($cache_images); |
|
1106 | 1106 | break; |
1107 | 1107 | |
1108 | 1108 | case "hide_images": |
1109 | - $qpart = "hide_images = " . $this->pdo->quote($hide_images); |
|
1109 | + $qpart = "hide_images = ".$this->pdo->quote($hide_images); |
|
1110 | 1110 | break; |
1111 | 1111 | |
1112 | 1112 | case "cat_id": |
1113 | 1113 | if (get_pref('ENABLE_FEED_CATS')) { |
1114 | 1114 | if ($cat_id) { |
1115 | - $qpart = "cat_id = " . $this->pdo->quote($cat_id); |
|
1115 | + $qpart = "cat_id = ".$this->pdo->quote($cat_id); |
|
1116 | 1116 | } else { |
1117 | 1117 | $qpart = 'cat_id = NULL'; |
1118 | 1118 | } |
@@ -1123,7 +1123,7 @@ discard block |
||
1123 | 1123 | break; |
1124 | 1124 | |
1125 | 1125 | case "feed_language": |
1126 | - $qpart = "feed_language = " . $this->pdo->quote($feed_language); |
|
1126 | + $qpart = "feed_language = ".$this->pdo->quote($feed_language); |
|
1127 | 1127 | break; |
1128 | 1128 | |
1129 | 1129 | } |
@@ -1184,14 +1184,14 @@ discard block |
||
1184 | 1184 | |
1185 | 1185 | $error_button = "<button dojoType=\"dijit.form.Button\" |
1186 | 1186 | onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" . |
1187 | - __("Feeds with errors") . "</button>"; |
|
1187 | + __("Feeds with errors")."</button>"; |
|
1188 | 1188 | } |
1189 | 1189 | |
1190 | 1190 | $inactive_button = "<button dojoType=\"dijit.form.Button\" |
1191 | 1191 | id=\"pref_feeds_inactive_btn\" |
1192 | 1192 | style=\"display : none\" |
1193 | 1193 | onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" . |
1194 | - __("Inactive feeds") . "</button>"; |
|
1194 | + __("Inactive feeds")."</button>"; |
|
1195 | 1195 | |
1196 | 1196 | $feed_search = clean($_REQUEST["search"]); |
1197 | 1197 | |
@@ -1213,7 +1213,7 @@ discard block |
||
1213 | 1213 | </div>"; |
1214 | 1214 | |
1215 | 1215 | print "<div dojoType=\"fox.form.DropDownButton\">". |
1216 | - "<span>" . __('Select')."</span>"; |
|
1216 | + "<span>".__('Select')."</span>"; |
|
1217 | 1217 | print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
1218 | 1218 | print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\" |
1219 | 1219 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
@@ -1222,7 +1222,7 @@ discard block |
||
1222 | 1222 | print "</div></div>"; |
1223 | 1223 | |
1224 | 1224 | print "<div dojoType=\"fox.form.DropDownButton\">". |
1225 | - "<span>" . __('Feeds')."</span>"; |
|
1225 | + "<span>".__('Feeds')."</span>"; |
|
1226 | 1226 | print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
1227 | 1227 | print "<div onclick=\"CommonDialogs.quickAddFeed()\" |
1228 | 1228 | dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>"; |
@@ -1238,7 +1238,7 @@ discard block |
||
1238 | 1238 | |
1239 | 1239 | if (get_pref('ENABLE_FEED_CATS')) { |
1240 | 1240 | print "<div dojoType=\"fox.form.DropDownButton\">". |
1241 | - "<span>" . __('Categories')."</span>"; |
|
1241 | + "<span>".__('Categories')."</span>"; |
|
1242 | 1242 | print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
1243 | 1243 | print "<div onclick=\"dijit.byId('feedTree').createCategory()\" |
1244 | 1244 | dojoType=\"dijit.MenuItem\">".__('Add category')."</div>"; |
@@ -1305,7 +1305,7 @@ discard block |
||
1305 | 1305 | print "<div dojoType='dijit.layout.AccordionPane' |
1306 | 1306 | title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>"; |
1307 | 1307 | |
1308 | - print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>"; |
|
1308 | + print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>"; |
|
1309 | 1309 | |
1310 | 1310 | print_notice("Only main settings profile can be migrated using OPML."); |
1311 | 1311 | |
@@ -1322,7 +1322,7 @@ discard block |
||
1322 | 1322 | <input type='hidden' name='op' value='dlg'> |
1323 | 1323 | <input type='hidden' name='method' value='importOpml'> |
1324 | 1324 | <button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" . |
1325 | - __('Import OPML') . "</button>"; |
|
1325 | + __('Import OPML')."</button>"; |
|
1326 | 1326 | |
1327 | 1327 | print "</form>"; |
1328 | 1328 | |
@@ -1330,22 +1330,22 @@ discard block |
||
1330 | 1330 | |
1331 | 1331 | print "<button dojoType='dijit.form.Button' |
1332 | 1332 | onclick='Helpers.OPML.export()' >" . |
1333 | - __('Export OPML') . "</button>"; |
|
1333 | + __('Export OPML')."</button>"; |
|
1334 | 1334 | |
1335 | 1335 | print " <label class='checkbox'>"; |
1336 | 1336 | print_checkbox("include_settings", true, "1", ""); |
1337 | - print " " . __("Include settings"); |
|
1337 | + print " ".__("Include settings"); |
|
1338 | 1338 | print "</label>"; |
1339 | 1339 | |
1340 | 1340 | print "</form>"; |
1341 | 1341 | |
1342 | 1342 | print "<p/>"; |
1343 | 1343 | |
1344 | - print "<h2>" . __("Published OPML") . "</h2>"; |
|
1344 | + print "<h2>".__("Published OPML")."</h2>"; |
|
1345 | 1345 | |
1346 | - print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . |
|
1347 | - " " . |
|
1348 | - __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>"; |
|
1346 | + print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.'). |
|
1347 | + " ". |
|
1348 | + __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>"; |
|
1349 | 1349 | |
1350 | 1350 | print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">". |
1351 | 1351 | __('Display published OPML URL')."</button> "; |
@@ -1358,10 +1358,10 @@ discard block |
||
1358 | 1358 | print "<div dojoType=\"dijit.layout.AccordionPane\" |
1359 | 1359 | title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">"; |
1360 | 1360 | |
1361 | - print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>"; |
|
1361 | + print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>"; |
|
1362 | 1362 | |
1363 | - $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . |
|
1364 | - "/public.php?op=rss&id=-2&view-mode=all_articles");; |
|
1363 | + $rss_url = '-2::'.htmlspecialchars(get_self_url_prefix(). |
|
1364 | + "/public.php?op=rss&id=-2&view-mode=all_articles"); ; |
|
1365 | 1365 | |
1366 | 1366 | print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">". |
1367 | 1367 | __('Display URL')."</button> "; |
@@ -1390,7 +1390,7 @@ discard block |
||
1390 | 1390 | $cat_unread = Feeds::getCategoryUnread($cat_id); |
1391 | 1391 | } |
1392 | 1392 | |
1393 | - $obj['id'] = 'CAT:' . $cat_id; |
|
1393 | + $obj['id'] = 'CAT:'.$cat_id; |
|
1394 | 1394 | $obj['items'] = array(); |
1395 | 1395 | $obj['name'] = Feeds::getCategoryTitle($cat_id); |
1396 | 1396 | $obj['type'] = 'category'; |
@@ -1410,7 +1410,7 @@ discard block |
||
1410 | 1410 | if ($unread === false) |
1411 | 1411 | $unread = getFeedUnread($feed_id, false); |
1412 | 1412 | |
1413 | - $obj['id'] = 'FEED:' . $feed_id; |
|
1413 | + $obj['id'] = 'FEED:'.$feed_id; |
|
1414 | 1414 | $obj['name'] = $title; |
1415 | 1415 | $obj['unread'] = (int) $unread; |
1416 | 1416 | $obj['type'] = 'feed'; |
@@ -1446,7 +1446,7 @@ discard block |
||
1446 | 1446 | |
1447 | 1447 | print "<div dojoType='fox.Toolbar'>"; |
1448 | 1448 | print "<div dojoType='fox.form.DropDownButton'>". |
1449 | - "<span>" . __('Select')."</span>"; |
|
1449 | + "<span>".__('Select')."</span>"; |
|
1450 | 1450 | print "<div dojoType='dijit.Menu' style='display: none'>"; |
1451 | 1451 | print "<div onclick=\"Tables.select('inactive-feeds-list', true)\" |
1452 | 1452 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
@@ -1503,7 +1503,7 @@ discard block |
||
1503 | 1503 | |
1504 | 1504 | print "<div dojoType=\"fox.Toolbar\">"; |
1505 | 1505 | print "<div dojoType=\"fox.form.DropDownButton\">". |
1506 | - "<span>" . __('Select')."</span>"; |
|
1506 | + "<span>".__('Select')."</span>"; |
|
1507 | 1507 | print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
1508 | 1508 | print "<div onclick=\"Tables.select('error-feeds-list', true)\" |
1509 | 1509 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
@@ -1567,7 +1567,7 @@ discard block |
||
1567 | 1567 | |
1568 | 1568 | public static function remove_feed($id, $owner_uid) { |
1569 | 1569 | foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) { |
1570 | - if (! $p->hook_unsubscribe_feed($id, $owner_uid)) { |
|
1570 | + if (!$p->hook_unsubscribe_feed($id, $owner_uid)) { |
|
1571 | 1571 | user_error("feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING); |
1572 | 1572 | return; |
1573 | 1573 | } |
@@ -1599,7 +1599,7 @@ discard block |
||
1599 | 1599 | $res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds"); |
1600 | 1600 | $row = $res->fetch(); |
1601 | 1601 | |
1602 | - $new_feed_id = (int)$row['id'] + 1; |
|
1602 | + $new_feed_id = (int) $row['id'] + 1; |
|
1603 | 1603 | |
1604 | 1604 | $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds |
1605 | 1605 | (id, owner_uid, title, feed_url, site_url, created) |
@@ -1631,8 +1631,8 @@ discard block |
||
1631 | 1631 | |
1632 | 1632 | $pdo->commit(); |
1633 | 1633 | |
1634 | - if (file_exists(ICONS_DIR . "/$id.ico")) { |
|
1635 | - unlink(ICONS_DIR . "/$id.ico"); |
|
1634 | + if (file_exists(ICONS_DIR."/$id.ico")) { |
|
1635 | + unlink(ICONS_DIR."/$id.ico"); |
|
1636 | 1636 | } |
1637 | 1637 | |
1638 | 1638 | CCache::remove($id, $owner_uid); |
@@ -1656,7 +1656,7 @@ discard block |
||
1656 | 1656 | |
1657 | 1657 | if (get_pref('ENABLE_FEED_CATS')) { |
1658 | 1658 | print "<fieldset>"; |
1659 | - print "<label>" . __('Place in category:') . "</label> "; |
|
1659 | + print "<label>".__('Place in category:')."</label> "; |
|
1660 | 1660 | print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"'); |
1661 | 1661 | print "</fieldset>"; |
1662 | 1662 | } |
@@ -1665,7 +1665,7 @@ discard block |
||
1665 | 1665 | |
1666 | 1666 | print "<div id='feedDlg_loginContainer' style='display : none'>"; |
1667 | 1667 | |
1668 | - print "<header>" . __("Authentication") . "</header>"; |
|
1668 | + print "<header>".__("Authentication")."</header>"; |
|
1669 | 1669 | print "<section>"; |
1670 | 1670 | |
1671 | 1671 | print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\"> |
@@ -1784,12 +1784,12 @@ discard block |
||
1784 | 1784 | $sth->execute([$_SESSION['uid']]); |
1785 | 1785 | |
1786 | 1786 | if ($row = $sth->fetch()) { |
1787 | - print (int)$row["num_inactive"]; |
|
1787 | + print (int) $row["num_inactive"]; |
|
1788 | 1788 | } |
1789 | 1789 | } |
1790 | 1790 | |
1791 | 1791 | public static function subscribe_to_feed_url() { |
1792 | - $url_path = get_self_url_prefix() . |
|
1792 | + $url_path = get_self_url_prefix(). |
|
1793 | 1793 | "/public.php?op=subscribe&feed_url=%s"; |
1794 | 1794 | return $url_path; |
1795 | 1795 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | print "<fieldset>"; |
55 | - print "<label>" . __("Login:") . "</label>"; |
|
55 | + print "<label>".__("Login:")."</label>"; |
|
56 | 56 | print "<input style='font-size : 16px' |
57 | 57 | dojoType='dijit.form.ValidationTextBox' required='1' |
58 | 58 | $sel_disabled name='login' value=\"$login\">"; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | print "<fieldset>"; |
67 | 67 | |
68 | - print "<label>" . __('Access level: ') . "</label> "; |
|
68 | + print "<label>".__('Access level: ')."</label> "; |
|
69 | 69 | |
70 | 70 | if (!$sel_disabled) { |
71 | 71 | print_select_hash("access_level", $access_level, $access_level_names, |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | print "</fieldset>"; |
80 | 80 | print "<fieldset>"; |
81 | 81 | |
82 | - print "<label>" . __("New password:") . "</label> "; |
|
82 | + print "<label>".__("New password:")."</label> "; |
|
83 | 83 | print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password' |
84 | 84 | name='password'>"; |
85 | 85 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | print "<section>"; |
92 | 92 | |
93 | 93 | print "<fieldset>"; |
94 | - print "<label>" . __("E-mail:") . "</label> "; |
|
94 | + print "<label>".__("E-mail:")."</label> "; |
|
95 | 95 | print "<input dojoType='dijit.form.TextBox' size='30' name='email' |
96 | 96 | value=\"$email\">"; |
97 | 97 | print "</fieldset>"; |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | print "<div dojoType='fox.form.DropDownButton'>". |
340 | - "<span>" . __('Select')."</span>"; |
|
340 | + "<span>".__('Select')."</span>"; |
|
341 | 341 | print "<div dojoType='dijit.Menu' style='display: none'>"; |
342 | 342 | print "<div onclick=\"Tables.select('prefUserList', true)\" |
343 | 343 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
@@ -405,12 +405,12 @@ discard block |
||
405 | 405 | print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();' |
406 | 406 | dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
407 | 407 | |
408 | - print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>"; |
|
408 | + print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> ".$line["login"]."</td>"; |
|
409 | 409 | |
410 | - print "<td>" . $access_level_names[$line["access_level"]] . "</td>"; |
|
411 | - print "<td>" . $line["num_feeds"] . "</td>"; |
|
412 | - print "<td>" . $line["created"] . "</td>"; |
|
413 | - print "<td>" . $line["last_login"] . "</td>"; |
|
410 | + print "<td>".$access_level_names[$line["access_level"]]."</td>"; |
|
411 | + print "<td>".$line["num_feeds"]."</td>"; |
|
412 | + print "<td>".$line["created"]."</td>"; |
|
413 | + print "<td>".$line["last_login"]."</td>"; |
|
414 | 414 | |
415 | 415 | print "</tr>"; |
416 | 416 |
@@ -1,130 +1,130 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | class Pref_Users extends Handler_Protected { |
3 | - public function before($method) { |
|
4 | - if (parent::before($method)) { |
|
5 | - if ($_SESSION["access_level"] < 10) { |
|
6 | - print __("Your access level is insufficient to open this tab."); |
|
7 | - return false; |
|
8 | - } |
|
9 | - return true; |
|
10 | - } |
|
11 | - return false; |
|
12 | - } |
|
3 | + public function before($method) { |
|
4 | + if (parent::before($method)) { |
|
5 | + if ($_SESSION["access_level"] < 10) { |
|
6 | + print __("Your access level is insufficient to open this tab."); |
|
7 | + return false; |
|
8 | + } |
|
9 | + return true; |
|
10 | + } |
|
11 | + return false; |
|
12 | + } |
|
13 | 13 | |
14 | - public function csrf_ignore($method) { |
|
15 | - $csrf_ignored = array("index", "edit", "userdetails"); |
|
14 | + public function csrf_ignore($method) { |
|
15 | + $csrf_ignored = array("index", "edit", "userdetails"); |
|
16 | 16 | |
17 | - return array_search($method, $csrf_ignored) !== false; |
|
18 | - } |
|
17 | + return array_search($method, $csrf_ignored) !== false; |
|
18 | + } |
|
19 | 19 | |
20 | - public function edit() { |
|
21 | - global $access_level_names; |
|
20 | + public function edit() { |
|
21 | + global $access_level_names; |
|
22 | 22 | |
23 | - print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>"; |
|
23 | + print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>"; |
|
24 | 24 | |
25 | - print '<div dojoType="dijit.layout.TabContainer" style="height : 400px"> |
|
25 | + print '<div dojoType="dijit.layout.TabContainer" style="height : 400px"> |
|
26 | 26 | <div dojoType="dijit.layout.ContentPane" title="'.__('Edit user').'">'; |
27 | 27 | |
28 | - //print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">"; |
|
28 | + //print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">"; |
|
29 | 29 | |
30 | - $id = (int) clean($_REQUEST["id"]); |
|
30 | + $id = (int) clean($_REQUEST["id"]); |
|
31 | 31 | |
32 | - print_hidden("id", "$id"); |
|
33 | - print_hidden("op", "pref-users"); |
|
34 | - print_hidden("method", "editSave"); |
|
32 | + print_hidden("id", "$id"); |
|
33 | + print_hidden("op", "pref-users"); |
|
34 | + print_hidden("method", "editSave"); |
|
35 | 35 | |
36 | - $sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?"); |
|
37 | - $sth->execute([$id]); |
|
36 | + $sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?"); |
|
37 | + $sth->execute([$id]); |
|
38 | 38 | |
39 | - if ($row = $sth->fetch()) { |
|
39 | + if ($row = $sth->fetch()) { |
|
40 | 40 | |
41 | - $login = $row["login"]; |
|
42 | - $access_level = $row["access_level"]; |
|
43 | - $email = $row["email"]; |
|
41 | + $login = $row["login"]; |
|
42 | + $access_level = $row["access_level"]; |
|
43 | + $email = $row["email"]; |
|
44 | 44 | |
45 | - $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : ""; |
|
45 | + $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : ""; |
|
46 | 46 | |
47 | - print "<header>".__("User")."</header>"; |
|
48 | - print "<section>"; |
|
47 | + print "<header>".__("User")."</header>"; |
|
48 | + print "<section>"; |
|
49 | 49 | |
50 | - if ($sel_disabled) { |
|
51 | - print_hidden("login", "$login"); |
|
52 | - } |
|
50 | + if ($sel_disabled) { |
|
51 | + print_hidden("login", "$login"); |
|
52 | + } |
|
53 | 53 | |
54 | - print "<fieldset>"; |
|
55 | - print "<label>" . __("Login:") . "</label>"; |
|
56 | - print "<input style='font-size : 16px' |
|
54 | + print "<fieldset>"; |
|
55 | + print "<label>" . __("Login:") . "</label>"; |
|
56 | + print "<input style='font-size : 16px' |
|
57 | 57 | dojoType='dijit.form.ValidationTextBox' required='1' |
58 | 58 | $sel_disabled name='login' value=\"$login\">"; |
59 | - print "</fieldset>"; |
|
59 | + print "</fieldset>"; |
|
60 | 60 | |
61 | - print "</section>"; |
|
61 | + print "</section>"; |
|
62 | 62 | |
63 | - print "<header>".__("Authentication")."</header>"; |
|
64 | - print "<section>"; |
|
63 | + print "<header>".__("Authentication")."</header>"; |
|
64 | + print "<section>"; |
|
65 | 65 | |
66 | - print "<fieldset>"; |
|
66 | + print "<fieldset>"; |
|
67 | 67 | |
68 | - print "<label>" . __('Access level: ') . "</label> "; |
|
68 | + print "<label>" . __('Access level: ') . "</label> "; |
|
69 | 69 | |
70 | - if (!$sel_disabled) { |
|
71 | - print_select_hash("access_level", $access_level, $access_level_names, |
|
72 | - "dojoType=\"fox.form.Select\" $sel_disabled"); |
|
73 | - } else { |
|
74 | - print_select_hash("", $access_level, $access_level_names, |
|
75 | - "dojoType=\"fox.form.Select\" $sel_disabled"); |
|
76 | - print_hidden("access_level", "$access_level"); |
|
77 | - } |
|
70 | + if (!$sel_disabled) { |
|
71 | + print_select_hash("access_level", $access_level, $access_level_names, |
|
72 | + "dojoType=\"fox.form.Select\" $sel_disabled"); |
|
73 | + } else { |
|
74 | + print_select_hash("", $access_level, $access_level_names, |
|
75 | + "dojoType=\"fox.form.Select\" $sel_disabled"); |
|
76 | + print_hidden("access_level", "$access_level"); |
|
77 | + } |
|
78 | 78 | |
79 | - print "</fieldset>"; |
|
80 | - print "<fieldset>"; |
|
79 | + print "</fieldset>"; |
|
80 | + print "<fieldset>"; |
|
81 | 81 | |
82 | - print "<label>" . __("New password:") . "</label> "; |
|
83 | - print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password' |
|
82 | + print "<label>" . __("New password:") . "</label> "; |
|
83 | + print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password' |
|
84 | 84 | name='password'>"; |
85 | 85 | |
86 | - print "</fieldset>"; |
|
86 | + print "</fieldset>"; |
|
87 | 87 | |
88 | - print "</section>"; |
|
88 | + print "</section>"; |
|
89 | 89 | |
90 | - print "<header>".__("Options")."</header>"; |
|
91 | - print "<section>"; |
|
90 | + print "<header>".__("Options")."</header>"; |
|
91 | + print "<section>"; |
|
92 | 92 | |
93 | - print "<fieldset>"; |
|
94 | - print "<label>" . __("E-mail:") . "</label> "; |
|
95 | - print "<input dojoType='dijit.form.TextBox' size='30' name='email' |
|
93 | + print "<fieldset>"; |
|
94 | + print "<label>" . __("E-mail:") . "</label> "; |
|
95 | + print "<input dojoType='dijit.form.TextBox' size='30' name='email' |
|
96 | 96 | value=\"$email\">"; |
97 | - print "</fieldset>"; |
|
97 | + print "</fieldset>"; |
|
98 | 98 | |
99 | - print "</section>"; |
|
99 | + print "</section>"; |
|
100 | 100 | |
101 | - print "</table>"; |
|
101 | + print "</table>"; |
|
102 | 102 | |
103 | - } |
|
103 | + } |
|
104 | 104 | |
105 | - print '</div>'; #tab |
|
106 | - print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\" |
|
105 | + print '</div>'; #tab |
|
106 | + print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\" |
|
107 | 107 | dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">"; |
108 | 108 | |
109 | - print '</div>'; |
|
110 | - print '</div>'; |
|
109 | + print '</div>'; |
|
110 | + print '</div>'; |
|
111 | 111 | |
112 | - print "<footer> |
|
112 | + print "<footer> |
|
113 | 113 | <button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('userEditDlg').execute()\">". |
114 | - __('Save')."</button> |
|
114 | + __('Save')."</button> |
|
115 | 115 | <button dojoType='dijit.form.Button' onclick=\"dijit.byId('userEditDlg').hide()\">". |
116 | - __('Cancel')."</button> |
|
116 | + __('Cancel')."</button> |
|
117 | 117 | </footer>"; |
118 | 118 | |
119 | - print "</form>"; |
|
119 | + print "</form>"; |
|
120 | 120 | |
121 | - return; |
|
122 | - } |
|
121 | + return; |
|
122 | + } |
|
123 | 123 | |
124 | - public function userdetails() { |
|
125 | - $id = (int) clean($_REQUEST["id"]); |
|
124 | + public function userdetails() { |
|
125 | + $id = (int) clean($_REQUEST["id"]); |
|
126 | 126 | |
127 | - $sth = $this->pdo->prepare("SELECT login, |
|
127 | + $sth = $this->pdo->prepare("SELECT login, |
|
128 | 128 | ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login, |
129 | 129 | access_level, |
130 | 130 | (SELECT COUNT(int_id) FROM ttrss_user_entries |
@@ -132,242 +132,242 @@ discard block |
||
132 | 132 | ".SUBSTRING_FOR_DATE."(created,1,16) AS created |
133 | 133 | FROM ttrss_users |
134 | 134 | WHERE id = ?"); |
135 | - $sth->execute([$id]); |
|
135 | + $sth->execute([$id]); |
|
136 | 136 | |
137 | - if ($row = $sth->fetch()) { |
|
138 | - print "<table width='100%'>"; |
|
137 | + if ($row = $sth->fetch()) { |
|
138 | + print "<table width='100%'>"; |
|
139 | 139 | |
140 | - $last_login = make_local_datetime( |
|
141 | - $row["last_login"], true); |
|
140 | + $last_login = make_local_datetime( |
|
141 | + $row["last_login"], true); |
|
142 | 142 | |
143 | - $created = make_local_datetime( |
|
144 | - $row["created"], true); |
|
143 | + $created = make_local_datetime( |
|
144 | + $row["created"], true); |
|
145 | 145 | |
146 | - $stored_articles = $row["stored_articles"]; |
|
146 | + $stored_articles = $row["stored_articles"]; |
|
147 | 147 | |
148 | - print "<tr><td>".__('Registered')."</td><td>$created</td></tr>"; |
|
149 | - print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>"; |
|
148 | + print "<tr><td>".__('Registered')."</td><td>$created</td></tr>"; |
|
149 | + print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>"; |
|
150 | 150 | |
151 | - $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds |
|
151 | + $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds |
|
152 | 152 | WHERE owner_uid = ?"); |
153 | - $sth->execute([$id]); |
|
154 | - $row = $sth->fetch(); |
|
155 | - $num_feeds = $row["num_feeds"]; |
|
153 | + $sth->execute([$id]); |
|
154 | + $row = $sth->fetch(); |
|
155 | + $num_feeds = $row["num_feeds"]; |
|
156 | 156 | |
157 | - print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>"; |
|
158 | - print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>"; |
|
157 | + print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>"; |
|
158 | + print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>"; |
|
159 | 159 | |
160 | - print "</table>"; |
|
160 | + print "</table>"; |
|
161 | 161 | |
162 | - print "<h1>".__('Subscribed feeds')."</h1>"; |
|
162 | + print "<h1>".__('Subscribed feeds')."</h1>"; |
|
163 | 163 | |
164 | - $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds |
|
164 | + $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds |
|
165 | 165 | WHERE owner_uid = ? ORDER BY title"); |
166 | - $sth->execute([$id]); |
|
166 | + $sth->execute([$id]); |
|
167 | 167 | |
168 | - print "<ul class=\"panel panel-scrollable list list-unstyled\">"; |
|
168 | + print "<ul class=\"panel panel-scrollable list list-unstyled\">"; |
|
169 | 169 | |
170 | - while ($line = $sth->fetch()) { |
|
170 | + while ($line = $sth->fetch()) { |
|
171 | 171 | |
172 | - $icon_file = ICONS_URL."/".$line["id"].".ico"; |
|
172 | + $icon_file = ICONS_URL."/".$line["id"].".ico"; |
|
173 | 173 | |
174 | - if (file_exists($icon_file) && filesize($icon_file) > 0) { |
|
175 | - $feed_icon = "<img class=\"icon\" src=\"$icon_file\">"; |
|
176 | - } else { |
|
177 | - $feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">"; |
|
178 | - } |
|
174 | + if (file_exists($icon_file) && filesize($icon_file) > 0) { |
|
175 | + $feed_icon = "<img class=\"icon\" src=\"$icon_file\">"; |
|
176 | + } else { |
|
177 | + $feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">"; |
|
178 | + } |
|
179 | 179 | |
180 | - print "<li>$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>"; |
|
180 | + print "<li>$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>"; |
|
181 | 181 | |
182 | - } |
|
182 | + } |
|
183 | 183 | |
184 | - print "</ul>"; |
|
184 | + print "</ul>"; |
|
185 | 185 | |
186 | 186 | |
187 | - } else { |
|
188 | - print "<h1>".__('User not found')."</h1>"; |
|
189 | - } |
|
187 | + } else { |
|
188 | + print "<h1>".__('User not found')."</h1>"; |
|
189 | + } |
|
190 | 190 | |
191 | - } |
|
191 | + } |
|
192 | 192 | |
193 | - public function editSave() { |
|
194 | - $login = trim(clean($_REQUEST["login"])); |
|
195 | - $uid = clean($_REQUEST["id"]); |
|
196 | - $access_level = (int) clean($_REQUEST["access_level"]); |
|
197 | - $email = trim(clean($_REQUEST["email"])); |
|
198 | - $password = clean($_REQUEST["password"]); |
|
193 | + public function editSave() { |
|
194 | + $login = trim(clean($_REQUEST["login"])); |
|
195 | + $uid = clean($_REQUEST["id"]); |
|
196 | + $access_level = (int) clean($_REQUEST["access_level"]); |
|
197 | + $email = trim(clean($_REQUEST["email"])); |
|
198 | + $password = clean($_REQUEST["password"]); |
|
199 | 199 | |
200 | - if ($password) { |
|
201 | - $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
|
202 | - $pwd_hash = encrypt_password($password, $salt, true); |
|
203 | - $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).", |
|
200 | + if ($password) { |
|
201 | + $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
|
202 | + $pwd_hash = encrypt_password($password, $salt, true); |
|
203 | + $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).", |
|
204 | 204 | salt = ".$this->pdo->quote($salt).","; |
205 | - } else { |
|
206 | - $pass_query_part = ""; |
|
207 | - } |
|
205 | + } else { |
|
206 | + $pass_query_part = ""; |
|
207 | + } |
|
208 | 208 | |
209 | - $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?, |
|
209 | + $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?, |
|
210 | 210 | access_level = ?, email = ?, otp_enabled = false WHERE id = ?"); |
211 | - $sth->execute([$login, $access_level, $email, $uid]); |
|
211 | + $sth->execute([$login, $access_level, $email, $uid]); |
|
212 | 212 | |
213 | - } |
|
213 | + } |
|
214 | 214 | |
215 | - public function remove() { |
|
216 | - $ids = explode(",", clean($_REQUEST["ids"])); |
|
215 | + public function remove() { |
|
216 | + $ids = explode(",", clean($_REQUEST["ids"])); |
|
217 | 217 | |
218 | - foreach ($ids as $id) { |
|
219 | - if ($id != $_SESSION["uid"] && $id != 1) { |
|
220 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?"); |
|
221 | - $sth->execute([$id]); |
|
218 | + foreach ($ids as $id) { |
|
219 | + if ($id != $_SESSION["uid"] && $id != 1) { |
|
220 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?"); |
|
221 | + $sth->execute([$id]); |
|
222 | 222 | |
223 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?"); |
|
224 | - $sth->execute([$id]); |
|
223 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?"); |
|
224 | + $sth->execute([$id]); |
|
225 | 225 | |
226 | - $sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?"); |
|
227 | - $sth->execute([$id]); |
|
228 | - } |
|
229 | - } |
|
230 | - } |
|
226 | + $sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?"); |
|
227 | + $sth->execute([$id]); |
|
228 | + } |
|
229 | + } |
|
230 | + } |
|
231 | 231 | |
232 | - public function add() { |
|
233 | - $login = trim(clean($_REQUEST["login"])); |
|
234 | - $tmp_user_pwd = make_password(); |
|
235 | - $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
|
236 | - $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); |
|
232 | + public function add() { |
|
233 | + $login = trim(clean($_REQUEST["login"])); |
|
234 | + $tmp_user_pwd = make_password(); |
|
235 | + $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
|
236 | + $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); |
|
237 | 237 | |
238 | - if (!$login) return; // no blank usernames |
|
238 | + if (!$login) return; // no blank usernames |
|
239 | 239 | |
240 | - $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE |
|
240 | + $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE |
|
241 | 241 | login = ?"); |
242 | - $sth->execute([$login]); |
|
242 | + $sth->execute([$login]); |
|
243 | 243 | |
244 | - if (!$sth->fetch()) { |
|
244 | + if (!$sth->fetch()) { |
|
245 | 245 | |
246 | - $sth = $this->pdo->prepare("INSERT INTO ttrss_users |
|
246 | + $sth = $this->pdo->prepare("INSERT INTO ttrss_users |
|
247 | 247 | (login,pwd_hash,access_level,last_login,created, salt) |
248 | 248 | VALUES (?, ?, 0, null, NOW(), ?)"); |
249 | - $sth->execute([$login, $pwd_hash, $salt]); |
|
249 | + $sth->execute([$login, $pwd_hash, $salt]); |
|
250 | 250 | |
251 | - $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE |
|
251 | + $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE |
|
252 | 252 | login = ? AND pwd_hash = ?"); |
253 | - $sth->execute([$login, $pwd_hash]); |
|
253 | + $sth->execute([$login, $pwd_hash]); |
|
254 | 254 | |
255 | - if ($row = $sth->fetch()) { |
|
255 | + if ($row = $sth->fetch()) { |
|
256 | 256 | |
257 | - $new_uid = $row['id']; |
|
257 | + $new_uid = $row['id']; |
|
258 | 258 | |
259 | - print T_sprintf("Added user %s with password %s", |
|
260 | - $login, $tmp_user_pwd); |
|
259 | + print T_sprintf("Added user %s with password %s", |
|
260 | + $login, $tmp_user_pwd); |
|
261 | 261 | |
262 | - initialize_user($new_uid); |
|
262 | + initialize_user($new_uid); |
|
263 | 263 | |
264 | - } else { |
|
264 | + } else { |
|
265 | 265 | |
266 | - print T_sprintf("Could not create user %s", $login); |
|
266 | + print T_sprintf("Could not create user %s", $login); |
|
267 | 267 | |
268 | - } |
|
269 | - } else { |
|
270 | - print T_sprintf("User %s already exists.", $login); |
|
271 | - } |
|
272 | - } |
|
268 | + } |
|
269 | + } else { |
|
270 | + print T_sprintf("User %s already exists.", $login); |
|
271 | + } |
|
272 | + } |
|
273 | 273 | |
274 | - public static function resetUserPassword($uid, $format_output = false) { |
|
274 | + public static function resetUserPassword($uid, $format_output = false) { |
|
275 | 275 | |
276 | - $pdo = Db::pdo(); |
|
276 | + $pdo = Db::pdo(); |
|
277 | 277 | |
278 | - $sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?"); |
|
279 | - $sth->execute([$uid]); |
|
278 | + $sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?"); |
|
279 | + $sth->execute([$uid]); |
|
280 | 280 | |
281 | - if ($row = $sth->fetch()) { |
|
281 | + if ($row = $sth->fetch()) { |
|
282 | 282 | |
283 | - $login = $row["login"]; |
|
283 | + $login = $row["login"]; |
|
284 | 284 | |
285 | - $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
|
286 | - $tmp_user_pwd = make_password(); |
|
285 | + $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
|
286 | + $tmp_user_pwd = make_password(); |
|
287 | 287 | |
288 | - $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true); |
|
288 | + $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true); |
|
289 | 289 | |
290 | - $sth = $pdo->prepare("UPDATE ttrss_users |
|
290 | + $sth = $pdo->prepare("UPDATE ttrss_users |
|
291 | 291 | SET pwd_hash = ?, salt = ?, otp_enabled = false |
292 | 292 | WHERE id = ?"); |
293 | - $sth->execute([$pwd_hash, $new_salt, $uid]); |
|
293 | + $sth->execute([$pwd_hash, $new_salt, $uid]); |
|
294 | 294 | |
295 | - $message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>"); |
|
295 | + $message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>"); |
|
296 | 296 | |
297 | - if ($format_output) |
|
298 | - print_notice($message); |
|
299 | - else |
|
300 | - print $message; |
|
297 | + if ($format_output) |
|
298 | + print_notice($message); |
|
299 | + else |
|
300 | + print $message; |
|
301 | 301 | |
302 | - } |
|
303 | - } |
|
302 | + } |
|
303 | + } |
|
304 | 304 | |
305 | - public function resetPass() { |
|
306 | - $uid = clean($_REQUEST["id"]); |
|
307 | - Pref_Users::resetUserPassword($uid); |
|
308 | - } |
|
305 | + public function resetPass() { |
|
306 | + $uid = clean($_REQUEST["id"]); |
|
307 | + Pref_Users::resetUserPassword($uid); |
|
308 | + } |
|
309 | 309 | |
310 | - public function index() { |
|
310 | + public function index() { |
|
311 | 311 | |
312 | - global $access_level_names; |
|
312 | + global $access_level_names; |
|
313 | 313 | |
314 | - print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; |
|
315 | - print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; |
|
316 | - print "<div dojoType='fox.Toolbar'>"; |
|
314 | + print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; |
|
315 | + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; |
|
316 | + print "<div dojoType='fox.Toolbar'>"; |
|
317 | 317 | |
318 | - $user_search = trim(clean($_REQUEST["search"])); |
|
318 | + $user_search = trim(clean($_REQUEST["search"])); |
|
319 | 319 | |
320 | - if (array_key_exists("search", $_REQUEST)) { |
|
321 | - $_SESSION["prefs_user_search"] = $user_search; |
|
322 | - } else { |
|
323 | - $user_search = $_SESSION["prefs_user_search"]; |
|
324 | - } |
|
320 | + if (array_key_exists("search", $_REQUEST)) { |
|
321 | + $_SESSION["prefs_user_search"] = $user_search; |
|
322 | + } else { |
|
323 | + $user_search = $_SESSION["prefs_user_search"]; |
|
324 | + } |
|
325 | 325 | |
326 | - print "<div style='float : right; padding-right : 4px;'> |
|
326 | + print "<div style='float : right; padding-right : 4px;'> |
|
327 | 327 | <input dojoType='dijit.form.TextBox' id='user_search' size='20' type='search' |
328 | 328 | value=\"$user_search\"> |
329 | 329 | <button dojoType='dijit.form.Button' onclick='Users.reload()'>". |
330 | - __('Search')."</button> |
|
330 | + __('Search')."</button> |
|
331 | 331 | </div>"; |
332 | 332 | |
333 | - $sort = clean($_REQUEST["sort"]); |
|
333 | + $sort = clean($_REQUEST["sort"]); |
|
334 | 334 | |
335 | - if (!$sort || $sort == "undefined") { |
|
336 | - $sort = "login"; |
|
337 | - } |
|
335 | + if (!$sort || $sort == "undefined") { |
|
336 | + $sort = "login"; |
|
337 | + } |
|
338 | 338 | |
339 | - print "<div dojoType='fox.form.DropDownButton'>". |
|
340 | - "<span>" . __('Select')."</span>"; |
|
341 | - print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
342 | - print "<div onclick=\"Tables.select('prefUserList', true)\" |
|
339 | + print "<div dojoType='fox.form.DropDownButton'>". |
|
340 | + "<span>" . __('Select')."</span>"; |
|
341 | + print "<div dojoType='dijit.Menu' style='display: none'>"; |
|
342 | + print "<div onclick=\"Tables.select('prefUserList', true)\" |
|
343 | 343 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
344 | - print "<div onclick=\"Tables.select('prefUserList', false)\" |
|
344 | + print "<div onclick=\"Tables.select('prefUserList', false)\" |
|
345 | 345 | dojoType='dijit.MenuItem'>".__('None')."</div>"; |
346 | - print "</div></div>"; |
|
346 | + print "</div></div>"; |
|
347 | 347 | |
348 | - print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>"; |
|
348 | + print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>"; |
|
349 | 349 | |
350 | - print " |
|
350 | + print " |
|
351 | 351 | <button dojoType='dijit.form.Button' onclick='Users.editSelected()'>". |
352 | - __('Edit')."</button dojoType=\"dijit.form.Button\"> |
|
352 | + __('Edit')."</button dojoType=\"dijit.form.Button\"> |
|
353 | 353 | <button dojoType='dijit.form.Button' onclick='Users.removeSelected()'>". |
354 | - __('Remove')."</button dojoType=\"dijit.form.Button\"> |
|
354 | + __('Remove')."</button dojoType=\"dijit.form.Button\"> |
|
355 | 355 | <button dojoType='dijit.form.Button' onclick='Users.resetSelected()'>". |
356 | - __('Reset password')."</button dojoType=\"dijit.form.Button\">"; |
|
356 | + __('Reset password')."</button dojoType=\"dijit.form.Button\">"; |
|
357 | 357 | |
358 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
359 | - "hook_prefs_tab_section", "prefUsersToolbar"); |
|
358 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, |
|
359 | + "hook_prefs_tab_section", "prefUsersToolbar"); |
|
360 | 360 | |
361 | - print "</div>"; #toolbar |
|
362 | - print "</div>"; #pane |
|
363 | - print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>"; |
|
361 | + print "</div>"; #toolbar |
|
362 | + print "</div>"; #pane |
|
363 | + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>"; |
|
364 | 364 | |
365 | - $sort = $this->validate_field($sort, |
|
366 | - ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); |
|
365 | + $sort = $this->validate_field($sort, |
|
366 | + ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); |
|
367 | 367 | |
368 | - if ($sort != "login") $sort = "$sort DESC"; |
|
368 | + if ($sort != "login") $sort = "$sort DESC"; |
|
369 | 369 | |
370 | - $sth = $this->pdo->prepare("SELECT |
|
370 | + $sth = $this->pdo->prepare("SELECT |
|
371 | 371 | tu.id, |
372 | 372 | login,access_level,email, |
373 | 373 | ".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login, |
@@ -378,11 +378,11 @@ discard block |
||
378 | 378 | WHERE |
379 | 379 | (:search = '' OR login LIKE :search) AND tu.id > 0 |
380 | 380 | ORDER BY $sort"); |
381 | - $sth->execute([":search" => $user_search ? "%$user_search%" : ""]); |
|
381 | + $sth->execute([":search" => $user_search ? "%$user_search%" : ""]); |
|
382 | 382 | |
383 | - print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>"; |
|
383 | + print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>"; |
|
384 | 384 | |
385 | - print "<tr class='title'> |
|
385 | + print "<tr class='title'> |
|
386 | 386 | <td align='center' width='5%'> </td> |
387 | 387 | <td width='20%'><a href='#' onclick=\"Users.reload('login')\">".__('Login')."</a></td> |
388 | 388 | <td width='20%'><a href='#' onclick=\"Users.reload('access_level')\">".__('Access Level')."</a></td> |
@@ -390,57 +390,57 @@ discard block |
||
390 | 390 | <td width='20%'><a href='#' onclick=\"Users.reload('created')\">".__('Registered')."</a></td> |
391 | 391 | <td width='20%'><a href='#' onclick=\"Users.reload('last_login')\">".__('Last login')."</a></td></tr>"; |
392 | 392 | |
393 | - $lnum = 0; |
|
393 | + $lnum = 0; |
|
394 | 394 | |
395 | - while ($line = $sth->fetch()) { |
|
395 | + while ($line = $sth->fetch()) { |
|
396 | 396 | |
397 | - $uid = $line["id"]; |
|
397 | + $uid = $line["id"]; |
|
398 | 398 | |
399 | - print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>"; |
|
399 | + print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>"; |
|
400 | 400 | |
401 | - $line["login"] = htmlspecialchars($line["login"]); |
|
402 | - $line["created"] = make_local_datetime($line["created"], false); |
|
403 | - $line["last_login"] = make_local_datetime($line["last_login"], false); |
|
401 | + $line["login"] = htmlspecialchars($line["login"]); |
|
402 | + $line["created"] = make_local_datetime($line["created"], false); |
|
403 | + $line["last_login"] = make_local_datetime($line["last_login"], false); |
|
404 | 404 | |
405 | - print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();' |
|
405 | + print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();' |
|
406 | 406 | dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
407 | 407 | |
408 | - print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>"; |
|
408 | + print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>"; |
|
409 | 409 | |
410 | - print "<td>" . $access_level_names[$line["access_level"]] . "</td>"; |
|
411 | - print "<td>" . $line["num_feeds"] . "</td>"; |
|
412 | - print "<td>" . $line["created"] . "</td>"; |
|
413 | - print "<td>" . $line["last_login"] . "</td>"; |
|
410 | + print "<td>" . $access_level_names[$line["access_level"]] . "</td>"; |
|
411 | + print "<td>" . $line["num_feeds"] . "</td>"; |
|
412 | + print "<td>" . $line["created"] . "</td>"; |
|
413 | + print "<td>" . $line["last_login"] . "</td>"; |
|
414 | 414 | |
415 | - print "</tr>"; |
|
415 | + print "</tr>"; |
|
416 | 416 | |
417 | - ++$lnum; |
|
418 | - } |
|
417 | + ++$lnum; |
|
418 | + } |
|
419 | 419 | |
420 | - print "</table>"; |
|
420 | + print "</table>"; |
|
421 | 421 | |
422 | - if ($lnum == 0) { |
|
423 | - if (!$user_search) { |
|
424 | - print_warning(__('No users defined.')); |
|
425 | - } else { |
|
426 | - print_warning(__('No matching users found.')); |
|
427 | - } |
|
428 | - } |
|
422 | + if ($lnum == 0) { |
|
423 | + if (!$user_search) { |
|
424 | + print_warning(__('No users defined.')); |
|
425 | + } else { |
|
426 | + print_warning(__('No matching users found.')); |
|
427 | + } |
|
428 | + } |
|
429 | 429 | |
430 | - print "</div>"; #pane |
|
430 | + print "</div>"; #pane |
|
431 | 431 | |
432 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
433 | - "hook_prefs_tab", "prefUsers"); |
|
432 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, |
|
433 | + "hook_prefs_tab", "prefUsers"); |
|
434 | 434 | |
435 | - print "</div>"; #container |
|
435 | + print "</div>"; #container |
|
436 | 436 | |
437 | - } |
|
437 | + } |
|
438 | 438 | |
439 | - public function validate_field($string, $allowed, $default = "") { |
|
440 | - if (in_array($string, $allowed)) |
|
441 | - return $string; |
|
442 | - else |
|
443 | - return $default; |
|
444 | - } |
|
439 | + public function validate_field($string, $allowed, $default = "") { |
|
440 | + if (in_array($string, $allowed)) |
|
441 | + return $string; |
|
442 | + else |
|
443 | + return $default; |
|
444 | + } |
|
445 | 445 | |
446 | 446 | } |
@@ -235,7 +235,10 @@ discard block |
||
235 | 235 | $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); |
236 | 236 | $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); |
237 | 237 | |
238 | - if (!$login) return; // no blank usernames |
|
238 | + if (!$login) { |
|
239 | + return; |
|
240 | + } |
|
241 | + // no blank usernames |
|
239 | 242 | |
240 | 243 | $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE |
241 | 244 | login = ?"); |
@@ -294,10 +297,11 @@ discard block |
||
294 | 297 | |
295 | 298 | $message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>"); |
296 | 299 | |
297 | - if ($format_output) |
|
298 | - print_notice($message); |
|
299 | - else |
|
300 | - print $message; |
|
300 | + if ($format_output) { |
|
301 | + print_notice($message); |
|
302 | + } else { |
|
303 | + print $message; |
|
304 | + } |
|
301 | 305 | |
302 | 306 | } |
303 | 307 | } |
@@ -365,7 +369,9 @@ discard block |
||
365 | 369 | $sort = $this->validate_field($sort, |
366 | 370 | ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); |
367 | 371 | |
368 | - if ($sort != "login") $sort = "$sort DESC"; |
|
372 | + if ($sort != "login") { |
|
373 | + $sort = "$sort DESC"; |
|
374 | + } |
|
369 | 375 | |
370 | 376 | $sth = $this->pdo->prepare("SELECT |
371 | 377 | tu.id, |
@@ -437,10 +443,11 @@ discard block |
||
437 | 443 | } |
438 | 444 | |
439 | 445 | public function validate_field($string, $allowed, $default = "") { |
440 | - if (in_array($string, $allowed)) |
|
441 | - return $string; |
|
442 | - else |
|
443 | - return $default; |
|
446 | + if (in_array($string, $allowed)) { |
|
447 | + return $string; |
|
448 | + } else { |
|
449 | + return $default; |
|
450 | + } |
|
444 | 451 | } |
445 | 452 | |
446 | 453 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | $ts = strftime("%H:%M:%S", time()); |
42 | 42 | if (function_exists('posix_getpid')) { |
43 | - $ts = "$ts/" . posix_getpid(); |
|
43 | + $ts = "$ts/".posix_getpid(); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | if (Debug::$logfile) { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | if (!$locked) { |
62 | 62 | fclose($fp); |
63 | - user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING); |
|
63 | + user_error("Unable to lock debugging log file: ".Debug::$logfile, E_USER_WARNING); |
|
64 | 64 | return; |
65 | 65 | } |
66 | 66 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | return; |
78 | 78 | |
79 | 79 | } else { |
80 | - user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING); |
|
80 | + user_error("Unable to open debugging log file: ".Debug::$logfile, E_USER_WARNING); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | class Debug { |
3 | - public static $LOG_DISABLED = -1; |
|
3 | + public static $LOG_DISABLED = -1; |
|
4 | 4 | public static $LOG_NORMAL = 0; |
5 | 5 | public static $LOG_VERBOSE = 1; |
6 | 6 | public static $LOG_EXTENDED = 2; |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | private static $logfile = false; |
11 | 11 | private static $loglevel = 0; |
12 | 12 | |
13 | - public static function set_logfile($logfile) { |
|
13 | + public static function set_logfile($logfile) { |
|
14 | 14 | Debug::$logfile = $logfile; |
15 | 15 | } |
16 | 16 |
@@ -36,7 +36,9 @@ discard block |
||
36 | 36 | |
37 | 37 | public static function log($message, $level = 0) { |
38 | 38 | |
39 | - if (!Debug::$enabled || Debug::$loglevel < $level) return false; |
|
39 | + if (!Debug::$enabled || Debug::$loglevel < $level) { |
|
40 | + return false; |
|
41 | + } |
|
40 | 42 | |
41 | 43 | $ts = strftime("%H:%M:%S", time()); |
42 | 44 | if (function_exists('posix_getpid')) { |
@@ -73,8 +75,9 @@ discard block |
||
73 | 75 | |
74 | 76 | fclose($fp); |
75 | 77 | |
76 | - if (Debug::$quiet) |
|
77 | - return; |
|
78 | + if (Debug::$quiet) { |
|
79 | + return; |
|
80 | + } |
|
78 | 81 | |
79 | 82 | } else { |
80 | 83 | user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING); |