@@ -165,18 +165,18 @@ discard block |
||
| 165 | 165 | Debug::set_enabled(true); |
| 166 | 166 | |
| 167 | 167 | if (isset($options["log-level"])) { |
| 168 | - Debug::set_loglevel((int)$options["log-level"]); |
|
| 169 | - } |
|
| 168 | + Debug::set_loglevel((int)$options["log-level"]); |
|
| 169 | + } |
|
| 170 | 170 | |
| 171 | 171 | if (isset($options["log"])) { |
| 172 | 172 | Debug::set_quiet(isset($options['quiet'])); |
| 173 | 173 | Debug::set_logfile($options["log"]); |
| 174 | - Debug::log("Logging to " . $options["log"]); |
|
| 175 | - } else { |
|
| 176 | - if (isset($options['quiet'])) { |
|
| 174 | + Debug::log("Logging to " . $options["log"]); |
|
| 175 | + } else { |
|
| 176 | + if (isset($options['quiet'])) { |
|
| 177 | 177 | Debug::set_loglevel(Debug::$LOG_DISABLED); |
| 178 | - } |
|
| 179 | - } |
|
| 178 | + } |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | 181 | if (!isset($options["daemon"])) { |
| 182 | 182 | $lock_filename = "update.lock"; |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | if (isset($options["daemon"])) { |
| 230 | 230 | while (true) { |
| 231 | 231 | $quiet = (isset($options["quiet"])) ? "--quiet" : ""; |
| 232 | - $log = isset($options['log']) ? '--log '.$options['log'] : ''; |
|
| 233 | - $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : ''; |
|
| 232 | + $log = isset($options['log']) ? '--log '.$options['log'] : ''; |
|
| 233 | + $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : ''; |
|
| 234 | 234 | |
| 235 | 235 | passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level"); |
| 236 | 236 | |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * @SuppressWarnings(PHPMD.UnusedLocalVariable) |
|
| 48 | - */ |
|
| 47 | + * @SuppressWarnings(PHPMD.UnusedLocalVariable) |
|
| 48 | + */ |
|
| 49 | 49 | function initial_sanity_check() { |
| 50 | 50 | |
| 51 | 51 | $errors = array(); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if (SINGLE_USER_MODE && class_exists("PDO")) { |
| 108 | - $pdo = DB::pdo(); |
|
| 108 | + $pdo = DB::pdo(); |
|
| 109 | 109 | |
| 110 | 110 | $res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1"); |
| 111 | 111 | |
@@ -163,7 +163,7 @@ |
||
| 163 | 163 | |
| 164 | 164 | // TODO: compat wrapper, remove at some point |
| 165 | 165 | function _debug($msg) { |
| 166 | - Debug::log($msg); |
|
| 166 | + Debug::log($msg); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | function reset_fetch_domain_quota() { |
@@ -167,14 +167,14 @@ discard block |
||
| 167 | 167 | $min = min($r, min($g, $b)); $max = max($r, max($g, $b)); |
| 168 | 168 | $delta = $max - $min; $l = ($min + $max) / 2; $s = 0; |
| 169 | 169 | if ($l > 0 && $l < 1) { |
| 170 | - $s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l)); |
|
| 170 | + $s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l)); |
|
| 171 | 171 | } |
| 172 | 172 | $h = 0; |
| 173 | 173 | if ($delta > 0) { |
| 174 | - if ($max == $r && $max != $g) $h += ($g - $b) / $delta; |
|
| 175 | - if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta); |
|
| 176 | - if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta); |
|
| 177 | - $h /= 6; |
|
| 174 | + if ($max == $r && $max != $g) $h += ($g - $b) / $delta; |
|
| 175 | + if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta); |
|
| 176 | + if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta); |
|
| 177 | + $h /= 6; |
|
| 178 | 178 | } return array($h, $s, $l); |
| 179 | 179 | } |
| 180 | 180 | |
@@ -184,8 +184,8 @@ discard block |
||
| 184 | 184 | $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s; |
| 185 | 185 | $m1 = $l * 2 - $m2; |
| 186 | 186 | return array(_color_hue2rgb($m1, $m2, $h + 0.33333), |
| 187 | - _color_hue2rgb($m1, $m2, $h), |
|
| 188 | - _color_hue2rgb($m1, $m2, $h - 0.33333)); |
|
| 187 | + _color_hue2rgb($m1, $m2, $h), |
|
| 188 | + _color_hue2rgb($m1, $m2, $h - 0.33333)); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | ### Helper function for _color_hsl2rgb(). |
@@ -201,23 +201,23 @@ discard block |
||
| 201 | 201 | function _color_unpack($hex, $normalize = false) { |
| 202 | 202 | |
| 203 | 203 | if (strpos($hex, '#') !== 0) |
| 204 | - $hex = _resolve_htmlcolor($hex); |
|
| 204 | + $hex = _resolve_htmlcolor($hex); |
|
| 205 | 205 | else |
| 206 | 206 | $hex = substr($hex, 1); |
| 207 | 207 | |
| 208 | 208 | if (strlen($hex) == 4) { |
| 209 | - $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3]; |
|
| 209 | + $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3]; |
|
| 210 | 210 | } |
| 211 | 211 | $c = hexdec($hex); |
| 212 | 212 | for ($i = 16; $i >= 0; $i -= 8) { |
| 213 | - $out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1); |
|
| 213 | + $out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1); |
|
| 214 | 214 | } return $out; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | ### Convert an RGB triplet to a hex color. |
| 218 | 218 | function _color_pack($rgb, $normalize = false) { |
| 219 | 219 | foreach ($rgb as $k => $v) { |
| 220 | - $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8)); |
|
| 220 | + $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8)); |
|
| 221 | 221 | }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -237,21 +237,21 @@ discard block |
||
| 237 | 237 | $v = $var_Max; |
| 238 | 238 | |
| 239 | 239 | if ($del_Max == 0) { |
| 240 | - $h = 0; |
|
| 241 | - $s = 0; |
|
| 240 | + $h = 0; |
|
| 241 | + $s = 0; |
|
| 242 | 242 | } else { |
| 243 | - $s = $del_Max / $var_Max; |
|
| 243 | + $s = $del_Max / $var_Max; |
|
| 244 | 244 | |
| 245 | - $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; |
|
| 246 | - $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; |
|
| 247 | - $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; |
|
| 245 | + $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; |
|
| 246 | + $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; |
|
| 247 | + $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; |
|
| 248 | 248 | |
| 249 | - if ($var_R == $var_Max) $h = $del_B - $del_G; |
|
| 250 | - else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B; |
|
| 251 | - else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R; |
|
| 249 | + if ($var_R == $var_Max) $h = $del_B - $del_G; |
|
| 250 | + else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B; |
|
| 251 | + else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R; |
|
| 252 | 252 | |
| 253 | - if ($h < 0) $h++; |
|
| 254 | - if ($h > 1) $h--; |
|
| 253 | + if ($h < 0) $h++; |
|
| 254 | + if ($h > 1) $h--; |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | return array($h, $s, $v); |
@@ -262,27 +262,27 @@ discard block |
||
| 262 | 262 | $s = $arr[1]; |
| 263 | 263 | $v = $arr[2]; |
| 264 | 264 | |
| 265 | - if($s == 0) { |
|
| 266 | - $r = $g = $B = $v * 255; |
|
| 267 | - } else { |
|
| 268 | - $var_H = $h * 6; |
|
| 269 | - $var_i = floor($var_H ); |
|
| 270 | - $var_1 = $v * (1 - $s ); |
|
| 271 | - $var_2 = $v * (1 - $s * ($var_H - $var_i ) ); |
|
| 272 | - $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) ); |
|
| 273 | - |
|
| 274 | - if ($var_i == 0) { $var_R = $v ; $var_G = $var_3 ; $var_B = $var_1 ; } |
|
| 275 | - else if ($var_i == 1) { $var_R = $var_2 ; $var_G = $v ; $var_B = $var_1 ; } |
|
| 276 | - else if ($var_i == 2) { $var_R = $var_1 ; $var_G = $v ; $var_B = $var_3 ; } |
|
| 277 | - else if ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2 ; $var_B = $v ; } |
|
| 278 | - else if ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1 ; $var_B = $v ; } |
|
| 279 | - else { $var_R = $v ; $var_G = $var_1 ; $var_B = $var_2 ; } |
|
| 280 | - |
|
| 281 | - $r = $var_R * 255; |
|
| 282 | - $g = $var_G * 255; |
|
| 283 | - $B = $var_B * 255; |
|
| 284 | - } |
|
| 285 | - return array($r, $g, $B); |
|
| 265 | + if($s == 0) { |
|
| 266 | + $r = $g = $B = $v * 255; |
|
| 267 | + } else { |
|
| 268 | + $var_H = $h * 6; |
|
| 269 | + $var_i = floor($var_H ); |
|
| 270 | + $var_1 = $v * (1 - $s ); |
|
| 271 | + $var_2 = $v * (1 - $s * ($var_H - $var_i ) ); |
|
| 272 | + $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) ); |
|
| 273 | + |
|
| 274 | + if ($var_i == 0) { $var_R = $v ; $var_G = $var_3 ; $var_B = $var_1 ; } |
|
| 275 | + else if ($var_i == 1) { $var_R = $var_2 ; $var_G = $v ; $var_B = $var_1 ; } |
|
| 276 | + else if ($var_i == 2) { $var_R = $var_1 ; $var_G = $v ; $var_B = $var_3 ; } |
|
| 277 | + else if ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2 ; $var_B = $v ; } |
|
| 278 | + else if ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1 ; $var_B = $v ; } |
|
| 279 | + else { $var_R = $v ; $var_G = $var_1 ; $var_B = $var_2 ; } |
|
| 280 | + |
|
| 281 | + $r = $var_R * 255; |
|
| 282 | + $g = $var_G * 255; |
|
| 283 | + $B = $var_B * 255; |
|
| 284 | + } |
|
| 285 | + return array($r, $g, $B); |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | function colorPalette($imageFile, $numColors, $granularity = 5) { |
@@ -315,19 +315,19 @@ discard block |
||
| 315 | 315 | if (!$img) return false; |
| 316 | 316 | |
| 317 | 317 | for($x = 0; $x < $size[0]; $x += $granularity) { |
| 318 | - for($y = 0; $y < $size[1]; $y += $granularity) { |
|
| 319 | - $thisColor = imagecolorat($img, $x, $y); |
|
| 320 | - $rgb = imagecolorsforindex($img, $thisColor); |
|
| 321 | - $red = round(round(($rgb['red'] / 0x33)) * 0x33); |
|
| 322 | - $green = round(round(($rgb['green'] / 0x33)) * 0x33); |
|
| 323 | - $blue = round(round(($rgb['blue'] / 0x33)) * 0x33); |
|
| 324 | - $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue); |
|
| 325 | - if(array_key_exists($thisRGB, $colors)) { |
|
| 326 | - $colors[$thisRGB]++; |
|
| 327 | - } else{ |
|
| 328 | - $colors[$thisRGB] = 1; |
|
| 329 | - } |
|
| 330 | - } |
|
| 318 | + for($y = 0; $y < $size[1]; $y += $granularity) { |
|
| 319 | + $thisColor = imagecolorat($img, $x, $y); |
|
| 320 | + $rgb = imagecolorsforindex($img, $thisColor); |
|
| 321 | + $red = round(round(($rgb['red'] / 0x33)) * 0x33); |
|
| 322 | + $green = round(round(($rgb['green'] / 0x33)) * 0x33); |
|
| 323 | + $blue = round(round(($rgb['blue'] / 0x33)) * 0x33); |
|
| 324 | + $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue); |
|
| 325 | + if(array_key_exists($thisRGB, $colors)) { |
|
| 326 | + $colors[$thisRGB]++; |
|
| 327 | + } else{ |
|
| 328 | + $colors[$thisRGB] = 1; |
|
| 329 | + } |
|
| 330 | + } |
|
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | arsort($colors); |
@@ -153,9 +153,9 @@ |
||
| 153 | 153 | title="<i class='material-icons'>info_outline</i> <?php echo __('System') ?>"></div> |
| 154 | 154 | <?php } ?> |
| 155 | 155 | <?php |
| 156 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS, |
|
| 157 | - "hook_prefs_tabs", false); |
|
| 158 | - ?> |
|
| 156 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS, |
|
| 157 | + "hook_prefs_tabs", false); |
|
| 158 | + ?> |
|
| 159 | 159 | </div> |
| 160 | 160 | <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> |
| 161 | 161 | <a class="text-muted" target="_blank" href="http://tt-rss.org/"> |
@@ -3,21 +3,21 @@ |
||
| 3 | 3 | private $host; |
| 4 | 4 | |
| 5 | 5 | function about() { |
| 6 | - return array(1.0, |
|
| 6 | + return array(1.0, |
|
| 7 | 7 | "Easy feed subscription and web page sharing using bookmarklets", |
| 8 | 8 | "fox", |
| 9 | - false, |
|
| 9 | + false, |
|
| 10 | 10 | "https://git.tt-rss.org/fox/tt-rss/wiki/ShareAnything"); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | function init($host) { |
| 14 | - $this->host = $host; |
|
| 14 | + $this->host = $host; |
|
| 15 | 15 | |
| 16 | - $host->add_hook($host::HOOK_PREFS_TAB, $this); |
|
| 16 | + $host->add_hook($host::HOOK_PREFS_TAB, $this); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | function hook_prefs_tab($args) { |
| 20 | - if ($args == "prefFeeds") { |
|
| 20 | + if ($args == "prefFeeds") { |
|
| 21 | 21 | |
| 22 | 22 | print "<div dojoType=\"dijit.layout.AccordionPane\" |
| 23 | 23 | title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">"; |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | $this->_mbenc = mb_internal_encoding(); |
| 545 | 545 | mb_internal_encoding ( "latin1" ); |
| 546 | 546 | } |
| 547 | - } |
|
| 547 | + } |
|
| 548 | 548 | |
| 549 | 549 | /// leave mbstring workaround mode |
| 550 | 550 | function _MBPop () |
@@ -938,9 +938,9 @@ discard block |
||
| 938 | 938 | |
| 939 | 939 | /// clear all attribute value overrides (for multi-queries) |
| 940 | 940 | function ResetOverrides () |
| 941 | - { |
|
| 942 | - $this->_overrides = array (); |
|
| 943 | - } |
|
| 941 | + { |
|
| 942 | + $this->_overrides = array (); |
|
| 943 | + } |
|
| 944 | 944 | |
| 945 | 945 | ////////////////////////////////////////////////////////////////////////////// |
| 946 | 946 | |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMElement extends \DOMElement |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMCdataSection extends \DOMCdataSection |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |