codysnider / tt-rss

errors.php

Indentation +9 added lines, -9 removed lines

@@ -7,10 +7,10 @@ 
 $ERRORS[0] = "";
 
 $ERRORS[1] = __("This program requires XmlHttpRequest " .
-        "to function properly. Your browser doesn't seem to support it.");
+		"to function properly. Your browser doesn't seem to support it.");
 
 $ERRORS[2] = __("This program requires cookies " .
-        "to function properly. Your browser doesn't seem to support them.");
+		"to function properly. Your browser doesn't seem to support them.");
 
 $ERRORS[3] = __("Backend sanity check failed.");
 
@@ -41,15 +41,15 @@ 
 $ERRORS[15] = __("Encoding data as JSON failed");
 
 if ($_REQUEST['mode'] == 'js') {
-    header("Content-Type: text/javascript; charset=UTF-8");
+	header("Content-Type: text/javascript; charset=UTF-8");
 
-    print "var ERRORS = [];\n";
+	print "var ERRORS = [];\n";
 
-    foreach ($ERRORS as $id => $error) {
+	foreach ($ERRORS as $id => $error) {
 
-        $error = preg_replace("/\n/", "", $error);
-        $error = preg_replace("/\"/", "\\\"", $error);
+		$error = preg_replace("/\n/", "", $error);
+		$error = preg_replace("/\"/", "\\\"", $error);
 
-        print "ERRORS[$id] = \"$error\";\n";
-    }
+		print "ERRORS[$id] = \"$error\";\n";
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -6,10 +6,10 @@
 
 $ERRORS[0] = "";
 
-$ERRORS[1] = __("This program requires XmlHttpRequest " .
+$ERRORS[1] = __("This program requires XmlHttpRequest ".
         "to function properly. Your browser doesn't seem to support it.");
 
-$ERRORS[2] = __("This program requires cookies " .
+$ERRORS[2] = __("This program requires cookies ".
         "to function properly. Your browser doesn't seem to support them.");
 
 $ERRORS[3] = __("Backend sanity check failed.");

lib/phpqrcode/bindings/tcpdf/qrcode.php

Indentation +24 added lines, -24 removed lines

@@ -173,29 +173,29 @@ 
 	/**
 	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
 	 */
-    define('QRSPEC_WIDTH_MAX', 177);
+	define('QRSPEC_WIDTH_MAX', 177);
 
 	// -----------------------------------------------------
 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH',    0);
 
-    /**
+	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS',    1);
 
-    /**
+	/**
 	 * Matrix index to get remainder from $capacity array.
 	 */
-    define('QRCAP_REMINDER', 2);
+	define('QRCAP_REMINDER', 2);
 
-    /**
+	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+	define('QRCAP_EC',       3);
 
 	// -----------------------------------------------------
 
@@ -204,33 +204,33 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS',  20);
 
-    /**
+	/**
 	 * Max number of symbols for structured mode
 	 */
-    define('MAX_STRUCTURED_SYMBOLS', 16);
+	define('MAX_STRUCTURED_SYMBOLS', 16);
 
 	// -----------------------------------------------------
 
-    // Masks
+	// Masks
 
-    /**
+	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+	define('N1',  3);
 
-    /**
+	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
 	define('N2',  3);
 
-    /**
+	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
 	 */
 	define('N3', 40);
 
-    /**
+	/**
 	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
 	 */
 	define('N4', 10);
@@ -264,12 +264,12 @@ 
 
 	// for compaibility with PHP4
 	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
+		/**
+		 * Convert a string to an array (needed for PHP4 compatibility)
+		 * @param string $string The input string.
+		 * @param int $split_length Maximum length of the chunk.
+		 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
+		 */
 		public function str_split($string, $split_length=1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {
@@ -2622,7 +2622,7 @@ 
 		}
 
 		/**
-		* Return block number 1
+		 * Return block number 1
 		 * @param array $spec
 		 * @return int value
 		 */

Spacing +262 added lines, -262 removed lines

@@ -180,12 +180,12 @@ 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+    define('QRCAP_WIDTH', 0);
 
     /**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+    define('QRCAP_WORDS', 1);
 
     /**
 	 * Matrix index to get remainder from $capacity array.
@@ -195,7 +195,7 @@ 
     /**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+    define('QRCAP_EC', 3);
 
 	// -----------------------------------------------------
 
@@ -204,7 +204,7 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+    define('STRUCTURE_HEADER_BITS', 20);
 
     /**
 	 * Max number of symbols for structured mode
@@ -218,12 +218,12 @@ 
     /**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+    define('N1', 3);
 
     /**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
-	define('N2',  3);
+	define('N2', 3);
 
     /**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
@@ -270,7 +270,7 @@ 
     	 * @param int $split_length Maximum length of the chunk.
     	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
     	 */
-		public function str_split($string, $split_length=1) {
+		public function str_split($string, $split_length = 1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {
 					$c = strlen($string);
@@ -481,7 +481,7 @@ 
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
 			36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
-			 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, //
+			 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, //
 			-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
 			25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
@@ -494,47 +494,47 @@ 
 		 * @access protected
 		 */
 		protected $capacity = array(
-			array(  0,    0, 0, array(   0,    0,    0,    0)), //
-			array( 21,   26, 0, array(   7,   10,   13,   17)), //  1
-			array( 25,   44, 7, array(  10,   16,   22,   28)), //
-			array( 29,   70, 7, array(  15,   26,   36,   44)), //
-			array( 33,  100, 7, array(  20,   36,   52,   64)), //
-			array( 37,  134, 7, array(  26,   48,   72,   88)), //  5
-			array( 41,  172, 7, array(  36,   64,   96,  112)), //
-			array( 45,  196, 0, array(  40,   72,  108,  130)), //
-			array( 49,  242, 0, array(  48,   88,  132,  156)), //
-			array( 53,  292, 0, array(  60,  110,  160,  192)), //
-			array( 57,  346, 0, array(  72,  130,  192,  224)), // 10
-			array( 61,  404, 0, array(  80,  150,  224,  264)), //
-			array( 65,  466, 0, array(  96,  176,  260,  308)), //
-			array( 69,  532, 0, array( 104,  198,  288,  352)), //
-			array( 73,  581, 3, array( 120,  216,  320,  384)), //
-			array( 77,  655, 3, array( 132,  240,  360,  432)), // 15
-			array( 81,  733, 3, array( 144,  280,  408,  480)), //
-			array( 85,  815, 3, array( 168,  308,  448,  532)), //
-			array( 89,  901, 3, array( 180,  338,  504,  588)), //
-			array( 93,  991, 3, array( 196,  364,  546,  650)), //
-			array( 97, 1085, 3, array( 224,  416,  600,  700)), // 20
-			array(101, 1156, 4, array( 224,  442,  644,  750)), //
-			array(105, 1258, 4, array( 252,  476,  690,  816)), //
-			array(109, 1364, 4, array( 270,  504,  750,  900)), //
-			array(113, 1474, 4, array( 300,  560,  810,  960)), //
-			array(117, 1588, 4, array( 312,  588,  870, 1050)), // 25
-			array(121, 1706, 4, array( 336,  644,  952, 1110)), //
-			array(125, 1828, 4, array( 360,  700, 1020, 1200)), //
-			array(129, 1921, 3, array( 390,  728, 1050, 1260)), //
-			array(133, 2051, 3, array( 420,  784, 1140, 1350)), //
-			array(137, 2185, 3, array( 450,  812, 1200, 1440)), // 30
-			array(141, 2323, 3, array( 480,  868, 1290, 1530)), //
-			array(145, 2465, 3, array( 510,  924, 1350, 1620)), //
-			array(149, 2611, 3, array( 540,  980, 1440, 1710)), //
-			array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
-			array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
-			array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
-			array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
-			array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
-			array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
-			array(177, 3706, 0, array( 750, 1372, 2040, 2430))  // 40
+			array(0, 0, 0, array(0, 0, 0, 0)), //
+			array(21, 26, 0, array(7, 10, 13, 17)), //  1
+			array(25, 44, 7, array(10, 16, 22, 28)), //
+			array(29, 70, 7, array(15, 26, 36, 44)), //
+			array(33, 100, 7, array(20, 36, 52, 64)), //
+			array(37, 134, 7, array(26, 48, 72, 88)), //  5
+			array(41, 172, 7, array(36, 64, 96, 112)), //
+			array(45, 196, 0, array(40, 72, 108, 130)), //
+			array(49, 242, 0, array(48, 88, 132, 156)), //
+			array(53, 292, 0, array(60, 110, 160, 192)), //
+			array(57, 346, 0, array(72, 130, 192, 224)), // 10
+			array(61, 404, 0, array(80, 150, 224, 264)), //
+			array(65, 466, 0, array(96, 176, 260, 308)), //
+			array(69, 532, 0, array(104, 198, 288, 352)), //
+			array(73, 581, 3, array(120, 216, 320, 384)), //
+			array(77, 655, 3, array(132, 240, 360, 432)), // 15
+			array(81, 733, 3, array(144, 280, 408, 480)), //
+			array(85, 815, 3, array(168, 308, 448, 532)), //
+			array(89, 901, 3, array(180, 338, 504, 588)), //
+			array(93, 991, 3, array(196, 364, 546, 650)), //
+			array(97, 1085, 3, array(224, 416, 600, 700)), // 20
+			array(101, 1156, 4, array(224, 442, 644, 750)), //
+			array(105, 1258, 4, array(252, 476, 690, 816)), //
+			array(109, 1364, 4, array(270, 504, 750, 900)), //
+			array(113, 1474, 4, array(300, 560, 810, 960)), //
+			array(117, 1588, 4, array(312, 588, 870, 1050)), // 25
+			array(121, 1706, 4, array(336, 644, 952, 1110)), //
+			array(125, 1828, 4, array(360, 700, 1020, 1200)), //
+			array(129, 1921, 3, array(390, 728, 1050, 1260)), //
+			array(133, 2051, 3, array(420, 784, 1140, 1350)), //
+			array(137, 2185, 3, array(450, 812, 1200, 1440)), // 30
+			array(141, 2323, 3, array(480, 868, 1290, 1530)), //
+			array(145, 2465, 3, array(510, 924, 1350, 1620)), //
+			array(149, 2611, 3, array(540, 980, 1440, 1710)), //
+			array(153, 2761, 3, array(570, 1036, 1530, 1800)), //
+			array(157, 2876, 0, array(570, 1064, 1590, 1890)), // 35
+			array(161, 3034, 0, array(600, 1120, 1680, 1980)), //
+			array(165, 3196, 0, array(630, 1204, 1770, 2100)), //
+			array(169, 3362, 0, array(660, 1260, 1860, 2220)), //
+			array(173, 3532, 0, array(720, 1316, 1950, 2310)), //
+			array(177, 3706, 0, array(750, 1372, 2040, 2430))  // 40
 		);
 
 		/**
@@ -543,9 +543,9 @@ 
 		 */
 		protected $lengthTableBits = array(
 			array(10, 12, 14),
-			array( 9, 11, 13),
-			array( 8, 16, 16),
-			array( 8, 10, 12)
+			array(9, 11, 13),
+			array(8, 16, 16),
+			array(8, 10, 12)
 		);
 
 		/**
@@ -554,47 +554,47 @@ 
 		 * @access protected
 		 */
 		protected $eccTable = array(
-			array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //  1
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), //  5
-			array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)), //
-			array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)), //
-			array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)), //
-			array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)), //
-			array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), // 10
-			array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)), //
-			array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)), //
-			array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)), //
-			array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)), //
-			array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), // 15
-			array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)), //
-			array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)), //
-			array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)), //
-			array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)), //
-			array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), // 20
-			array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)), //
-			array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)), //
-			array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)), //
-			array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)), //
-			array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
-			array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)), //
-			array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)), //
-			array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
-			array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)), //
-			array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
-			array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)), //
-			array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)), //
-			array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)), //
-			array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)), //
-			array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), // 35
-			array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
-			array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)), //
-			array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
-			array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)), //
-			array(array(19,  6), array(18, 31), array(34, 34), array(20, 61))  // 40
+			array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)), //
+			array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //  1
+			array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //
+			array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)), //
+			array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)), //
+			array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), //  5
+			array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)), //
+			array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)), //
+			array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)), //
+			array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)), //
+			array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), // 10
+			array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)), //
+			array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)), //
+			array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)), //
+			array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)), //
+			array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), // 15
+			array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)), //
+			array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)), //
+			array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)), //
+			array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)), //
+			array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), // 20
+			array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)), //
+			array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)), //
+			array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)), //
+			array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)), //
+			array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), // 25
+			array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), //
+			array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)), //
+			array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)), //
+			array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)), //
+			array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
+			array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)), //
+			array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), //
+			array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), //
+			array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), //
+			array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), // 35
+			array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)), //
+			array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), //
+			array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)), //
+			array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), //
+			array(array(19, 6), array(18, 31), array(34, 34), array(20, 61))  // 40
 		);
 
 		/**
@@ -604,9 +604,9 @@ 
 		 * @access protected
 		 */
 		protected $alignmentPattern = array(
-			array( 0,  0),
-			array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), //  1- 5
-			array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
+			array(0, 0),
+			array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), //  1- 5
+			array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
 			array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
 			array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
 			array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
@@ -679,7 +679,7 @@ 
 			foreach ($qrTab as $line) {
 				$arrAdd = array();
 				foreach (str_split($line) as $char) {
-					$arrAdd[] = ($char=='1')?1:0;
+					$arrAdd[] = ($char == '1') ? 1 : 0;
 				}
 				$barcode_array['bcode'][] = $arrAdd;
 			}
@@ -704,8 +704,8 @@ 
 			$len = count($frame);
 			// the frame is square (width = height)
 			foreach ($frame as &$frameLine) {
-				for ($i=0; $i<$len; $i++) {
-					$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
+				for ($i = 0; $i < $len; $i++) {
+					$frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';
 				}
 			}
 			return $frame;
@@ -755,10 +755,10 @@ 
 			$this->dir = -1;
 			$this->bit = -1;
 			// inteleaved data and ecc codes
-			for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
+			for ($i = 0; $i < ($this->dataLength + $this->eccLength); $i++) {
 				$code = $this->getCode();
 				$bit = 0x80;
-				for ($j=0; $j<8; $j++) {
+				for ($j = 0; $j < 8; $j++) {
 					$addr = $this->getNextPosition();
 					$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
 					$bit = $bit >> 1;
@@ -766,7 +766,7 @@ 
 			}
 			// remainder bits
 			$j = $this->getRemainder($this->version);
-			for ($i=0; $i<$j; $i++) {
+			for ($i = 0; $i < $j; $i++) {
 				$addr = $this->getNextPosition();
 				$this->setFrameAt($addr, 0x02);
 			}
@@ -856,7 +856,7 @@ 
 				}
 				$this->x = $x;
 				$this->y = $y;
-			} while(ord($this->frame[$y][$x]) & 0x80);
+			} while (ord($this->frame[$y][$x]) & 0x80);
 			return array('x'=>$x, 'y'=>$y);
 		}
 
@@ -877,7 +877,7 @@ 
 			$dataPos = 0;
 			$eccPos = 0;
 			$endfor = $this->rsBlockNum1($spec);
-			for ($i=0; $i < $endfor; ++$i) {
+			for ($i = 0; $i < $endfor; ++$i) {
 				$ecc = array_slice($this->ecccode, $eccPos);
 				$this->rsblocks[$blockNo] = array();
 				$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -885,7 +885,7 @@ 
 				$this->rsblocks[$blockNo]['eccLength'] = $el;
 				$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
 				$this->rsblocks[$blockNo]['ecc'] = $ecc;
-				$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+				$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
 				$dataPos += $dl;
 				$eccPos += $el;
 				$blockNo++;
@@ -900,7 +900,7 @@ 
 				return -1;
 			}
 			$endfor = $this->rsBlockNum2($spec);
-			for ($i=0; $i < $endfor; ++$i) {
+			for ($i = 0; $i < $endfor; ++$i) {
 				$ecc = array_slice($this->ecccode, $eccPos);
 				$this->rsblocks[$blockNo] = array();
 				$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -953,8 +953,8 @@ 
 		 */
 		 protected function writeFormatInformation($width, &$frame, $mask, $level) {
 			$blacks = 0;
-			$format =  $this->getFormatInfo($mask, $level);
-			for ($i=0; $i<8; ++$i) {
+			$format = $this->getFormatInfo($mask, $level);
+			for ($i = 0; $i < 8; ++$i) {
 				if ($format & 1) {
 					$blacks += 2;
 					$v = 0x85;
@@ -969,7 +969,7 @@ 
 				}
 				$format = $format >> 1;
 			}
-			for ($i=0; $i<7; ++$i) {
+			for ($i = 0; $i < 7; ++$i) {
 			if ($format & 1) {
 				$blacks += 2;
 				$v = 0x85;
@@ -1034,7 +1034,7 @@ 
 		 * @return int mask
 		 */
 		 protected function mask4($x, $y) {
-			return (((int)($y / 2)) + ((int)($x / 3))) & 1;
+			return (((int) ($y / 2)) + ((int) ($x / 3))) & 1;
 		}
 
 		/**
@@ -1076,13 +1076,13 @@ 
 		 */
 		protected function generateMaskNo($maskNo, $width, $frame) {
 			$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
+			for ($y = 0; $y < $width; ++$y) {
+				for ($x = 0; $x < $width; ++$x) {
 					if (ord($frame[$y][$x]) & 0x80) {
 						$bitMask[$y][$x] = 0;
 					} else {
 						$maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-						$bitMask[$y][$x] = ($maskFunc == 0)?1:0;
+						$bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
 					}
 				}
 			}
@@ -1098,7 +1098,7 @@ 
 		 * @param boolean $maskGenOnly
 		 * @return int b
 		 */
-		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
+		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) {
 			$b = 0;
 			$bitMask = array();
 			$bitMask = $this->generateMaskNo($maskNo, $width, $s);
@@ -1106,12 +1106,12 @@ 
 				return;
 			}
 			$d = $s;
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
+			for ($y = 0; $y < $width; ++$y) {
+				for ($x = 0; $x < $width; ++$x) {
 					if ($bitMask[$y][$x] == 1) {
-						$d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
+						$d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);
 					}
-					$b += (int)(ord($d[$y][$x]) & 1);
+					$b += (int) (ord($d[$y][$x]) & 1);
 				}
 			}
 			return $b;
@@ -1139,20 +1139,20 @@ 
 		 */
 		 protected function calcN1N3($length) {
 			$demerit = 0;
-			for ($i=0; $i<$length; ++$i) {
+			for ($i = 0; $i < $length; ++$i) {
 				if ($this->runLength[$i] >= 5) {
 					$demerit += (N1 + ($this->runLength[$i] - 5));
 				}
 				if ($i & 1) {
-					if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
-						$fact = (int)($this->runLength[$i] / 3);
-						if (($this->runLength[$i-2] == $fact)
-							AND ($this->runLength[$i-1] == $fact)
-							AND ($this->runLength[$i+1] == $fact)
-							AND ($this->runLength[$i+2] == $fact)) {
-							if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
+					if (($i >= 3) AND ($i < ($length - 2)) AND ($this->runLength[$i] % 3 == 0)) {
+						$fact = (int) ($this->runLength[$i] / 3);
+						if (($this->runLength[$i - 2] == $fact)
+							AND ($this->runLength[$i - 1] == $fact)
+							AND ($this->runLength[$i + 1] == $fact)
+							AND ($this->runLength[$i + 2] == $fact)) {
+							if (($this->runLength[$i - 3] < 0) OR ($this->runLength[$i - 3] >= (4 * $fact))) {
 								$demerit += N3;
-							} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
+							} elseif ((($i + 3) >= $length) OR ($this->runLength[$i + 3] >= (4 * $fact))) {
 								$demerit += N3;
 							}
 						}
@@ -1171,17 +1171,17 @@ 
 		 protected function evaluateSymbol($width, $frame) {
 			$head = 0;
 			$demerit = 0;
-			for ($y=0; $y<$width; ++$y) {
+			for ($y = 0; $y < $width; ++$y) {
 				$head = 0;
 				$this->runLength[0] = 1;
 				$frameY = $frame[$y];
 				if ($y > 0) {
-					$frameYM = $frame[$y-1];
+					$frameYM = $frame[$y - 1];
 				}
-				for ($x=0; $x<$width; ++$x) {
+				for ($x = 0; $x < $width; ++$x) {
 					if (($x > 0) AND ($y > 0)) {
-						$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-						$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
+						$b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
+						$w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
 						if (($b22 | ($w22 ^ 1)) & 1) {
 							$demerit += N2;
 						}
@@ -1191,7 +1191,7 @@ 
 						$head = 1;
 						$this->runLength[$head] = 1;
 					} elseif ($x > 0) {
-						if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
+						if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
 							$head++;
 							$this->runLength[$head] = 1;
 						} else {
@@ -1199,18 +1199,18 @@ 
 						}
 					}
 				}
-				$demerit += $this->calcN1N3($head+1);
+				$demerit += $this->calcN1N3($head + 1);
 			}
-			for ($x=0; $x<$width; ++$x) {
+			for ($x = 0; $x < $width; ++$x) {
 				$head = 0;
 				$this->runLength[0] = 1;
-				for ($y=0; $y<$width; ++$y) {
+				for ($y = 0; $y < $width; ++$y) {
 					if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
 						$this->runLength[0] = -1;
 						$head = 1;
 						$this->runLength[$head] = 1;
 					} elseif ($y > 0) {
-						if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
+						if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
 							$head++;
 							$this->runLength[$head] = 1;
 						} else {
@@ -1218,7 +1218,7 @@ 
 						}
 					}
 				}
-				$demerit += $this->calcN1N3($head+1);
+				$demerit += $this->calcN1N3($head + 1);
 			}
 			return $demerit;
 		}
@@ -1237,8 +1237,8 @@ 
 			$checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
 			if (QR_FIND_FROM_RANDOM !== false) {
 				$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
-				for ($i = 0; $i <  $howManuOut; ++$i) {
-					$remPos = rand (0, count($checked_masks)-1);
+				for ($i = 0; $i < $howManuOut; ++$i) {
+					$remPos = rand(0, count($checked_masks) - 1);
 					unset($checked_masks[$remPos]);
 					$checked_masks = array_values($checked_masks);
 				}
@@ -1250,8 +1250,8 @@ 
 				$blacks = 0;
 				$blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
 				$blacks += $this->writeFormatInformation($width, $mask, $i, $level);
-				$blacks  = (int)(100 * $blacks / ($width * $width));
-				$demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
+				$blacks  = (int) (100 * $blacks / ($width * $width));
+				$demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);
 				$demerit += $this->evaluateSymbol($width, $mask);
 				if ($demerit < $minDemerit) {
 					$minDemerit = $demerit;
@@ -1276,7 +1276,7 @@ 
 			if ($pos >= strlen($str)) {
 				return false;
 			}
-			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
+			return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
 		}
 
 		/**
@@ -1307,8 +1307,8 @@ 
 			} elseif ($this->isalnumat($this->dataStr, $pos)) {
 				return QR_MODE_AN;
 			} elseif ($this->hint == QR_MODE_KJ) {
-				if ($pos+1 < strlen($this->dataStr)) {
-					$d = $this->dataStr[$pos+1];
+				if ($pos + 1 < strlen($this->dataStr)) {
+					$d = $this->dataStr[$pos + 1];
 					$word = (ord($c) << 8) | ord($d);
 					if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
 						return QR_MODE_KJ;
@@ -1325,7 +1325,7 @@ 
 		 protected function eatNum() {
 			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 			$p = 0;
-			while($this->isdigitat($this->dataStr, $p)) {
+			while ($this->isdigitat($this->dataStr, $p)) {
 				$p++;
 			}
 			$run = $p;
@@ -1341,7 +1341,7 @@ 
 			if ($mode == QR_MODE_AN) {
 				$dif = $this->estimateBitsModeNum($run) + 4 + $ln
 				+ $this->estimateBitsModeAn(1)        // + 4 + la
-				- $this->estimateBitsModeAn($run + 1);// - 4 - la
+				- $this->estimateBitsModeAn($run + 1); // - 4 - la
 				if ($dif > 0) {
 					return $this->eatAn();
 				}
@@ -1355,13 +1355,13 @@ 
 		 * @return int run
 		 */
 		 protected function eatAn() {
-			$la = $this->lengthIndicator(QR_MODE_AN,  $this->version);
+			$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
 			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 			$p = 0;
-			while($this->isalnumat($this->dataStr, $p)) {
+			while ($this->isalnumat($this->dataStr, $p)) {
 				if ($this->isdigitat($this->dataStr, $p)) {
 					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
+					while ($this->isdigitat($this->dataStr, $q)) {
 						$q++;
 					}
 					$dif = $this->estimateBitsModeAn($p) // + 4 + la
@@ -1395,7 +1395,7 @@ 
 		 */
 		 protected function eatKanji() {
 			$p = 0;
-			while($this->identifyMode($p) == QR_MODE_KJ) {
+			while ($this->identifyMode($p) == QR_MODE_KJ) {
 				$p += 2;
 			}
 			$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
@@ -1411,14 +1411,14 @@ 
 			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 			$p = 1;
 			$dataStrLen = strlen($this->dataStr);
-			while($p < $dataStrLen) {
+			while ($p < $dataStrLen) {
 				$mode = $this->identifyMode($p);
 				if ($mode == QR_MODE_KJ) {
 					break;
 				}
 				if ($mode == QR_MODE_NM) {
 					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
+					while ($this->isdigitat($this->dataStr, $q)) {
 						$q++;
 					}
 					$dif = $this->estimateBitsMode8($p) // + 4 + l8
@@ -1431,7 +1431,7 @@ 
 					}
 				} elseif ($mode == QR_MODE_AN) {
 					$q = $p;
-					while($this->isalnumat($this->dataStr, $q)) {
+					while ($this->isalnumat($this->dataStr, $q)) {
 						$q++;
 					}
 					$dif = $this->estimateBitsMode8($p)  // + 4 + l8
@@ -1524,7 +1524,7 @@ 
 		 * @param array $bstream
 		 * @return array input item
 		 */
-		 protected function newInputItem($mode, $size, $data, $bstream=null) {
+		 protected function newInputItem($mode, $size, $data, $bstream = null) {
 			$setData = array_slice($data, 0, $size);
 			if (count($setData) < $size) {
 				$setData = array_merge($setData, array_fill(0, ($size - count($setData)), 0));
@@ -1547,23 +1547,23 @@ 
 		 * @return array input item
 		 */
 		 protected function encodeModeNum($inputitem, $version) {
-			$words = (int)($inputitem['size'] / 3);
+			$words = (int) ($inputitem['size'] / 3);
 			$inputitem['bstream'] = array();
 			$val = 0x1;
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_NM, $version), $inputitem['size']);
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (ord($inputitem['data'][$i*3  ]) - ord('0')) * 100;
-				$val += (ord($inputitem['data'][$i*3+1]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$i*3+2]) - ord('0'));
+			for ($i = 0; $i < $words; ++$i) {
+				$val  = (ord($inputitem['data'][$i * 3]) - ord('0')) * 100;
+				$val += (ord($inputitem['data'][$i * 3 + 1]) - ord('0')) * 10;
+				$val += (ord($inputitem['data'][$i * 3 + 2]) - ord('0'));
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val);
 			}
 			if ($inputitem['size'] - $words * 3 == 1) {
-				$val = ord($inputitem['data'][$words*3]) - ord('0');
+				$val = ord($inputitem['data'][$words * 3]) - ord('0');
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
 			} elseif (($inputitem['size'] - ($words * 3)) == 2) {
-				$val  = (ord($inputitem['data'][$words*3  ]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$words*3+1]) - ord('0'));
+				$val  = (ord($inputitem['data'][$words * 3]) - ord('0')) * 10;
+				$val += (ord($inputitem['data'][$words * 3 + 1]) - ord('0'));
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val);
 			}
 			return $inputitem;
@@ -1576,13 +1576,13 @@ 
 		 * @return array input item
 		 */
 		 protected function encodeModeAn($inputitem, $version) {
-			$words = (int)($inputitem['size'] / 2);
+			$words = (int) ($inputitem['size'] / 2);
 			$inputitem['bstream'] = array();
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
 			$inputitem['bstream'] = $this->appendNum(v, $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (int)$this->lookAnTable(ord($inputitem['data'][$i*2  ])) * 45;
-				$val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1]));
+			for ($i = 0; $i < $words; ++$i) {
+				$val  = (int) $this->lookAnTable(ord($inputitem['data'][$i * 2])) * 45;
+				$val += (int) $this->lookAnTable(ord($inputitem['data'][$i * 2 + 1]));
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
 			}
 			if ($inputitem['size'] & 1) {
@@ -1602,7 +1602,7 @@ 
 			$inputitem['bstream'] = array();
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4);
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_8B, $version), $inputitem['size']);
-			for ($i=0; $i < $inputitem['size']; ++$i) {
+			for ($i = 0; $i < $inputitem['size']; ++$i) {
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][$i]));
 			}
 			return $inputitem;
@@ -1617,9 +1617,9 @@ 
 		 protected function encodeModeKanji($inputitem, $version) {
 			$inputitem['bstream'] = array();
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int)($inputitem['size'] / 2));
-			for ($i=0; $i<$inputitem['size']; $i+=2) {
-				$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i+1]);
+			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int) ($inputitem['size'] / 2));
+			for ($i = 0; $i < $inputitem['size']; $i += 2) {
+				$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i + 1]);
 				if ($val <= 0x9ffc) {
 					$val -= 0x8140;
 				} else {
@@ -1664,7 +1664,7 @@ 
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
 			} else {
-				switch($inputitem['mode']) {
+				switch ($inputitem['mode']) {
 					case QR_MODE_NM: {
 						$inputitem = $this->encodeModeNum($inputitem, $version);
 						break;
@@ -1742,7 +1742,7 @@ 
 			$parity = 0;
 			foreach ($items as $item) {
 				if ($item['mode'] != QR_MODE_ST) {
-					for ($i=$item['size']-1; $i>=0; --$i) {
+					for ($i = $item['size'] - 1; $i >= 0; --$i) {
 						$parity ^= $item['data'][$i];
 					}
 				}
@@ -1757,8 +1757,8 @@ 
 		 * @return boolean true or false
 		 */
 		 protected function checkModeNum($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
-				if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
+			for ($i = 0; $i < $size; ++$i) {
+				if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))) {
 					return false;
 				}
 			}
@@ -1771,9 +1771,9 @@ 
 		 * @return int number of bits
 		 */
 		 protected function estimateBitsModeNum($size) {
-			$w = (int)$size / 3;
+			$w = (int) $size / 3;
 			$bits = $w * 10;
-			switch($size - $w * 3) {
+			switch ($size - $w * 3) {
 				case 1: {
 					$bits += 4;
 					break;
@@ -1795,7 +1795,7 @@ 
 		 * @return value
 		 */
 		protected function lookAnTable($c) {
-			return (($c > 127)?-1:$this->anTable[$c]);
+			return (($c > 127) ?-1 : $this->anTable[$c]);
 		}
 
 		/**
@@ -1805,7 +1805,7 @@ 
 		 * @return boolean true or false
 		 */
 		 protected function checkModeAn($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
+			for ($i = 0; $i < $size; ++$i) {
 				if ($this->lookAnTable(ord($data[$i])) == -1) {
 					return false;
 				}
@@ -1819,7 +1819,7 @@ 
 		 * @return int number of bits
 		 */
 		 protected function estimateBitsModeAn($size) {
-			$w = (int)($size / 2);
+			$w = (int) ($size / 2);
 			$bits = $w * 11;
 			if ($size & 1) {
 				$bits += 6;
@@ -1842,7 +1842,7 @@ 
 		 * @return int number of bits
 		 */
 		 protected function estimateBitsModeKanji($size) {
-			return (int)(($size / 2) * 13);
+			return (int) (($size / 2) * 13);
 		}
 
 		/**
@@ -1855,8 +1855,8 @@ 
 			if ($size & 1) {
 				return false;
 			}
-			for ($i=0; $i<$size; $i+=2) {
-				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
+			for ($i = 0; $i < $size; $i += 2) {
+				$val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
 				if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
 					return false;
 				}
@@ -1875,7 +1875,7 @@ 
 			if ($size <= 0) {
 				return false;
 			}
-			switch($mode) {
+			switch ($mode) {
 				case QR_MODE_NM: {
 					return $this->checkModeNum($size, $data);
 				}
@@ -1910,7 +1910,7 @@ 
 				$version = 1;
 			}
 			foreach ($items as $item) {
-				switch($item['mode']) {
+				switch ($item['mode']) {
 					case QR_MODE_NM: {
 						$bits = $this->estimateBitsModeNum($item['size']);
 						break;
@@ -1936,7 +1936,7 @@ 
 				}
 				$l = $this->lengthIndicator($item['mode'], $version);
 				$m = 1 << $l;
-				$num = (int)(($item['size'] + $m - 1) / $m);
+				$num = (int) (($item['size'] + $m - 1) / $m);
 				$bits += $num * (4 + $l);
 			}
 			return $bits;
@@ -1953,7 +1953,7 @@ 
 			do {
 				$prev = $version;
 				$bits = $this->estimateBitStreamSize($items, $prev);
-				$version = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+				$version = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level);
 				if ($version < 0) {
 					return -1;
 				}
@@ -1970,9 +1970,9 @@ 
 		 */
 		 protected function lengthOfCode($mode, $version, $bits) {
 			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
-			switch($mode) {
+			switch ($mode) {
 				case QR_MODE_NM: {
-					$chunks = (int)($payload / 10);
+					$chunks = (int) ($payload / 10);
 					$remain = $payload - $chunks * 10;
 					$size = $chunks * 3;
 					if ($remain >= 7) {
@@ -1983,7 +1983,7 @@ 
 					break;
 				}
 				case QR_MODE_AN: {
-					$chunks = (int)($payload / 11);
+					$chunks = (int) ($payload / 11);
 					$remain = $payload - $chunks * 11;
 					$size = $chunks * 2;
 					if ($remain >= 6) {
@@ -1992,15 +1992,15 @@ 
 					break;
 				}
 				case QR_MODE_8B: {
-					$size = (int)($payload / 8);
+					$size = (int) ($payload / 8);
 					break;
 				}
 				case QR_MODE_KJ: {
-					$size = (int)(($payload / 13) * 2);
+					$size = (int) (($payload / 13) * 2);
 					break;
 				}
 				case QR_MODE_ST: {
-					$size = (int)($payload / 8);
+					$size = (int) ($payload / 8);
 					break;
 				}
 				default: {
@@ -2050,7 +2050,7 @@ 
 				if ($bits < 0) {
 					return -1;
 				}
-				$ver = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+				$ver = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level);
 				if ($ver < 0) {
 					return -1;
 				} elseif ($ver > $this->version) {
@@ -2078,14 +2078,14 @@ 
 				return $this->appendNum($bstream, $maxbits - $bits, 0);
 			}
 			$bits += 4;
-			$words = (int)(($bits + 7) / 8);
+			$words = (int) (($bits + 7) / 8);
 			$padding = array();
 			$padding = $this->appendNum($padding, $words * 8 - $bits + 4, 0);
 			$padlen = $maxwords - $words;
 			if ($padlen > 0) {
 				$padbuf = array();
-				for ($i=0; $i<$padlen; ++$i) {
-					$padbuf[$i] = ($i&1)?0x11:0xec;
+				for ($i = 0; $i < $padlen; ++$i) {
+					$padbuf[$i] = ($i & 1) ? 0x11 : 0xec;
 				}
 				$padding = $this->appendBytes($padding, $padlen, $padbuf);
 			}
@@ -2148,7 +2148,7 @@ 
 		 protected function newFromNum($bits, $num) {
 			$bstream = $this->allocate($bits);
 			$mask = 1 << ($bits - 1);
-			for ($i=0; $i<$bits; ++$i) {
+			for ($i = 0; $i < $bits; ++$i) {
 				if ($num & $mask) {
 					$bstream[$i] = 1;
 				} else {
@@ -2167,10 +2167,10 @@ 
 		 */
 		 protected function newFromBytes($size, $data) {
 			$bstream = $this->allocate($size * 8);
-			$p=0;
-			for ($i=0; $i<$size; ++$i) {
+			$p = 0;
+			for ($i = 0; $i < $size; ++$i) {
 				$mask = 0x80;
-				for ($j=0; $j<8; ++$j) {
+				for ($j = 0; $j < 8; ++$j) {
 					if ($data[$i] & $mask) {
 						$bstream[$p] = 1;
 					} else {
@@ -2239,12 +2239,12 @@ 
 			if ($size == 0) {
 				return array();
 			}
-			$data = array_fill(0, (int)(($size + 7) / 8), 0);
-			$bytes = (int)($size / 8);
+			$data = array_fill(0, (int) (($size + 7) / 8), 0);
+			$bytes = (int) ($size / 8);
 			$p = 0;
-			for ($i=0; $i<$bytes; $i++) {
+			for ($i = 0; $i < $bytes; $i++) {
 				$v = 0;
-				for ($j=0; $j<8; $j++) {
+				for ($j = 0; $j < 8; $j++) {
 					$v = $v << 1;
 					$v |= $bstream[$p];
 					$p++;
@@ -2253,7 +2253,7 @@ 
 			}
 			if ($size & 7) {
 				$v = 0;
-				for ($j=0; $j<($size & 7); $j++) {
+				for ($j = 0; $j < ($size & 7); $j++) {
 					$v = $v << 1;
 					$v |= $bstream[$p];
 					$p++;
@@ -2276,8 +2276,8 @@ 
 		 * @param int $replLen length of the repl string
 		 * @return array srctab
 		 */
-		 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
+		 protected function qrstrset($srctab, $x, $y, $repl, $replLen = false) {
+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
 			return $srctab;
 		}
 
@@ -2297,7 +2297,7 @@ 
 		 * @param int $level error correction level
 		 * @return int ECC size (bytes)
 		 */
-		protected function getECCLength($version, $level){
+		protected function getECCLength($version, $level) {
 			return $this->capacity[$version][QRCAP_EC][$level];
 		}
 
@@ -2326,8 +2326,8 @@ 
 		 * @return int version number
 		 */
 		protected function getMinimumVersion($size, $level) {
-			for ($i=1; $i <= QRSPEC_VERSION_MAX; ++$i) {
-				$words  = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
+			for ($i = 1; $i <= QRSPEC_VERSION_MAX; ++$i) {
+				$words = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
 				if ($words >= $size) {
 					return $i;
 				}
@@ -2397,14 +2397,14 @@ 
 			$ecc = $this->getECCLength($version, $level);
 			if ($b2 == 0) {
 				$spec[0] = $b1;
-				$spec[1] = (int)($data / $b1);
-				$spec[2] = (int)($ecc / $b1);
+				$spec[1] = (int) ($data / $b1);
+				$spec[2] = (int) ($ecc / $b1);
 				$spec[3] = 0;
 				$spec[4] = 0;
 			} else {
 				$spec[0] = $b1;
-				$spec[1] = (int)($data / ($b1 + $b2));
-				$spec[2] = (int)($ecc  / ($b1 + $b2));
+				$spec[1] = (int) ($data / ($b1 + $b2));
+				$spec[2] = (int) ($ecc / ($b1 + $b2));
 				$spec[3] = $b2;
 				$spec[4] = $spec[1] + 1;
 			}
@@ -2429,8 +2429,8 @@ 
 				);
 			$yStart = $oy - 2;
 			$xStart = $ox - 2;
-			for ($y=0; $y < 5; $y++) {
-				$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
+			for ($y = 0; $y < 5; $y++) {
+				$frame = $this->qrstrset($frame, $xStart, $yStart + $y, $finder[$y]);
 			}
 			return $frame;
 		}
@@ -2450,7 +2450,7 @@ 
 			if ($d < 0) {
 				$w = 2;
 			} else {
-				$w = (int)(($width - $this->alignmentPattern[$version][0]) / $d + 2);
+				$w = (int) (($width - $this->alignmentPattern[$version][0]) / $d + 2);
 			}
 			if ($w * $w - 3 == 1) {
 				$x = $this->alignmentPattern[$version][0];
@@ -2460,15 +2460,15 @@ 
 			}
 			$cx = $this->alignmentPattern[$version][0];
 			$wo = $w - 1;
-			for ($x=1; $x < $wo; ++$x) {
+			for ($x = 1; $x < $wo; ++$x) {
 				$frame = $this->putAlignmentMarker($frame, 6, $cx);
-				$frame = $this->putAlignmentMarker($frame, $cx,  6);
+				$frame = $this->putAlignmentMarker($frame, $cx, 6);
 				$cx += $d;
 			}
 			$cy = $this->alignmentPattern[$version][0];
-			for ($y=0; $y < $wo; ++$y) {
+			for ($y = 0; $y < $wo; ++$y) {
 				$cx = $this->alignmentPattern[$version][0];
-				for ($x=0; $x < $wo; ++$x) {
+				for ($x = 0; $x < $wo; ++$x) {
 					$frame = $this->putAlignmentMarker($frame, $cx, $cy);
 					$cx += $d;
 				}
@@ -2523,7 +2523,7 @@ 
 			"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
 			"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
 			);
-			for ($y=0; $y < 7; $y++) {
+			for ($y = 0; $y < 7; $y++) {
 				$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
 			}
 			return $frame;
@@ -2536,7 +2536,7 @@ 
 		 */
 		protected function createFrame($version) {
 			$width = $this->capacity[$version][QRCAP_WIDTH];
-			$frameLine = str_repeat ("\0", $width);
+			$frameLine = str_repeat("\0", $width);
 			$frame = array_fill(0, $width, $frameLine);
 			// Finder pattern
 			$frame = $this->putFinderPattern($frame, 0, 0);
@@ -2544,7 +2544,7 @@ 
 			$frame = $this->putFinderPattern($frame, 0, $width - 7);
 			// Separator
 			$yOffset = $width - 7;
-			for ($y=0; $y < 7; ++$y) {
+			for ($y = 0; $y < 7; ++$y) {
 				$frame[$y][7] = "\xc0";
 				$frame[$y][$width - 8] = "\xc0";
 				$frame[$yOffset][7] = "\xc0";
@@ -2552,22 +2552,22 @@ 
 			}
 			$setPattern = str_repeat("\xc0", 8);
 			$frame = $this->qrstrset($frame, 0, 7, $setPattern);
-			$frame = $this->qrstrset($frame, $width-8, 7, $setPattern);
+			$frame = $this->qrstrset($frame, $width - 8, 7, $setPattern);
 			$frame = $this->qrstrset($frame, 0, $width - 8, $setPattern);
 			// Format info
 			$setPattern = str_repeat("\x84", 9);
 			$frame = $this->qrstrset($frame, 0, 8, $setPattern);
 			$frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8);
 			$yOffset = $width - 8;
-			for ($y=0; $y < 8; ++$y,++$yOffset) {
+			for ($y = 0; $y < 8; ++$y, ++$yOffset) {
 				$frame[$y][8] = "\x84";
 				$frame[$yOffset][8] = "\x84";
 			}
 			// Timing pattern
 			$wo = $width - 15;
-			for ($i=1; $i < $wo; ++$i) {
-				$frame[6][7+$i] = chr(0x90 | ($i & 1));
-				$frame[7+$i][6] = chr(0x90 | ($i & 1));
+			for ($i = 1; $i < $wo; ++$i) {
+				$frame[6][7 + $i] = chr(0x90 | ($i & 1));
+				$frame[7 + $i][6] = chr(0x90 | ($i & 1));
 			}
 			// Alignment pattern
 			$frame = $this->putAlignmentPattern($version, $frame, $width);
@@ -2575,16 +2575,16 @@ 
 			if ($version >= 7) {
 				$vinf = $this->getVersionPattern($version);
 				$v = $vinf;
-				for ($x=0; $x<6; ++$x) {
-					for ($y=0; $y<3; ++$y) {
-						$frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
+				for ($x = 0; $x < 6; ++$x) {
+					for ($y = 0; $y < 3; ++$y) {
+						$frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));
 						$v = $v >> 1;
 					}
 				}
 				$v = $vinf;
-				for ($y=0; $y<6; ++$y) {
-					for ($x=0; $x<3; ++$x) {
-						$frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
+				for ($y = 0; $y < 6; ++$y) {
+					for ($x = 0; $x < 3; ++$x) {
+						$frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));
 						$v = $v >> 1;
 					}
 				}
@@ -2755,16 +2755,16 @@ 
 			if (($symsize < 0) OR ($symsize > 8)) {
 				return $rs;
 			}
-			if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
+			if (($fcr < 0) OR ($fcr >= (1 << $symsize))) {
 				return $rs;
 			}
-			if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
+			if (($prim <= 0) OR ($prim >= (1 << $symsize))) {
 				return $rs;
 			}
-			if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
+			if (($nroots < 0) OR ($nroots >= (1 << $symsize))) {
 				return $rs;
 			}
-			if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
+			if (($pad < 0) OR ($pad >= ((1 << $symsize) - 1 - $nroots))) {
 				return $rs;
 			}
 			$rs = array();
@@ -2774,13 +2774,13 @@ 
 			$rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
 			$rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
 			// PHP style macro replacement ;)
-			$NN =& $rs['nn'];
-			$A0 =& $NN;
+			$NN = & $rs['nn'];
+			$A0 = & $NN;
 			// Generate Galois field lookup tables
 			$rs['index_of'][0] = $A0; // log(zero) = -inf
 			$rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
 			$sr = 1;
-			for ($i=0; $i<$rs['nn']; ++$i) {
+			for ($i = 0; $i < $rs['nn']; ++$i) {
 				$rs['index_of'][$sr] = $i;
 				$rs['alpha_to'][$i] = $sr;
 				$sr <<= 1;
@@ -2800,21 +2800,21 @@ 
 			$rs['nroots'] = $nroots;
 			$rs['gfpoly'] = $gfpoly;
 			// Find prim-th root of 1, used in decoding
-			for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
+			for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
 				; // intentional empty-body loop!
 			}
-			$rs['iprim'] = (int)($iprim / $prim);
+			$rs['iprim'] = (int) ($iprim / $prim);
 			$rs['genpoly'][0] = 1;
 
 
-			for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-				$rs['genpoly'][$i+1] = 1;
+			for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {
+				$rs['genpoly'][$i + 1] = 1;
 				// Multiply rs->genpoly[] by  @**(root + x)
 				for ($j = $i; $j > 0; --$j) {
 					if ($rs['genpoly'][$j] != 0) {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
+						$rs['genpoly'][$j] = $rs['genpoly'][$j - 1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
 					} else {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1];
+						$rs['genpoly'][$j] = $rs['genpoly'][$j - 1];
 					}
 				}
 				// rs->genpoly[0] can never be zero
@@ -2835,26 +2835,26 @@ 
 		 * @return parity array
 		 */
 		 protected function encode_rs_char($rs, $data, $parity) {
-			$MM       =& $rs['mm']; // bits per symbol
-			$NN       =& $rs['nn']; // the total number of symbols in a RS block
-			$ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
-			$INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
-			$GENPOLY  =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
-			$NROOTS   =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
-			$FCR      =& $rs['fcr']; // first consecutive root, index form
-			$PRIM     =& $rs['prim']; // primitive element, index form
-			$IPRIM    =& $rs['iprim']; // prim-th root of 1, index form
-			$PAD      =& $rs['pad']; // the number of pad symbols in a block
-			$A0       =& $NN;
+			$MM       = & $rs['mm']; // bits per symbol
+			$NN       = & $rs['nn']; // the total number of symbols in a RS block
+			$ALPHA_TO = & $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
+			$INDEX_OF = & $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
+			$GENPOLY  = & $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
+			$NROOTS   = & $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
+			$FCR      = & $rs['fcr']; // first consecutive root, index form
+			$PRIM     = & $rs['prim']; // primitive element, index form
+			$IPRIM    = & $rs['iprim']; // prim-th root of 1, index form
+			$PAD      = & $rs['pad']; // the number of pad symbols in a block
+			$A0       = & $NN;
 			$parity = array_fill(0, $NROOTS, 0);
-			for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
+			for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {
 				$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
 				if ($feedback != $A0) {
 					// feedback term is non-zero
 					// This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
 					// always be for the polynomials constructed by init_rs()
 					$feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
-					for ($j=1; $j < $NROOTS; ++$j) {
+					for ($j = 1; $j < $NROOTS; ++$j) {
 					$parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
 					}
 				}

classes/rpc.php

Spacing +7 added lines, -7 removed lines

@@ -237,7 +237,7 @@ 
 					$new_feed_id = $row['id'];
 				} else {
 					$row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -287,7 +287,7 @@ 
 	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
 	public function catchupSelected() {
 		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+		$cmode = (int) clean($_REQUEST["cmode"]);
 
 		Article::catchupArticlesById($ids, $cmode);
 
@@ -296,7 +296,7 @@ 
 
 	public function markSelected() {
 		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+		$cmode = (int) clean($_REQUEST["cmode"]);
 
 		$this->markArticlesById($ids, $cmode);
 
@@ -305,7 +305,7 @@ 
 
 	public function publishSelected() {
 		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+		$cmode = (int) clean($_REQUEST["cmode"]);
 
 		$this->publishArticlesById($ids, $cmode);
 
@@ -342,7 +342,7 @@ 
 
 		print "<ul>";
 		while ($line = $sth->fetch()) {
-			print "<li>" . $line["caption"] . "</li>";
+			print "<li>".$line["caption"]."</li>";
 		}
 		print "</ul>";
 	}
@@ -578,7 +578,7 @@ 
 
 		if ($msg) {
 			Logger::get()->log_error(E_USER_WARNING,
-				$msg, 'client-js:' . $file, $line, $context);
+				$msg, 'client-js:'.$file, $line, $context);
 
 			echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
 		} else {
@@ -602,7 +602,7 @@ 
 				$content = json_decode($content, true);
 
 				if ($content && isset($content["changeset"])) {
-					if ($git_timestamp < (int)$content["changeset"]["timestamp"] &&
+					if ($git_timestamp < (int) $content["changeset"]["timestamp"] &&
 						$git_commit != $content["changeset"]["id"]) {
 
 						$rv = $content["changeset"];

Braces +15 added lines, -6 removed lines

@@ -11,7 +11,9 @@ 
 		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
 		// default value
-		if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
+		if (!$_SESSION["profile"]) {
+			$_SESSION["profile"] = null;
+		}
 	}
 
 	public function remprofiles() {
@@ -173,7 +175,9 @@ 
 				if ($row = $sth->fetch()) {
 					$feed_id = $row["id"];
 				} else {
-					if (!$title) $title = '[Unknown]';
+					if (!$title) {
+						$title = '[Unknown]';
+					}
 
 					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
@@ -216,7 +220,9 @@ 
 	private function archive_article($id, $owner_uid) {
 		$this->pdo->beginTransaction();
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
@@ -278,8 +284,9 @@ 
 			'seq' => $seq
 		];
 
-		if ($seq % 2 == 0)
-			$reply['runtime-info'] = make_runtime_info();
+		if ($seq % 2 == 0) {
+					$reply['runtime-info'] = make_runtime_info();
+		}
 
 		print json_encode($reply);
 	}
@@ -353,7 +360,9 @@ 
 		$payload = json_decode(clean($_REQUEST["payload"]), false);
 		$mode = clean($_REQUEST["mode"]);
 
-		if (!$payload || !is_array($payload)) return;
+		if (!$payload || !is_array($payload)) {
+			return;
+		}
 
 		if ($mode == 1) {
 			foreach ($payload as $feed) {

classes/article.php

Indentation +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 		$sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = ? AND id = ref_id AND owner_uid = ?
 						LIMIT 1");
-        $sth->execute([$id, $_SESSION['uid']]);
+		$sth->execute([$id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
 			$article_url = $row['link'];
@@ -76,7 +76,7 @@ 
 
 			$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
-            $sth->execute([$ref_id, $owner_uid]);
+			$sth->execute([$ref_id, $owner_uid]);
 
 			if ($row = $sth->fetch()) {
 				$int_id = $row['int_id'];
@@ -616,22 +616,22 @@ 
 
 	public static function purge_orphans() {
 
-        // purge orphaned posts in main content table
+		// purge orphaned posts in main content table
 
-        if (DB_TYPE == "mysql")
-            $limit_qpart = "LIMIT 5000";
-        else
-            $limit_qpart = "";
+		if (DB_TYPE == "mysql")
+			$limit_qpart = "LIMIT 5000";
+		else
+			$limit_qpart = "";
 
-        $pdo = Db::pdo();
-        $res = $pdo->query("DELETE FROM ttrss_entries WHERE
+		$pdo = Db::pdo();
+		$res = $pdo->query("DELETE FROM ttrss_entries WHERE
 			NOT EXISTS (SELECT ref_id FROM ttrss_user_entries WHERE ref_id = id) $limit_qpart");
 
-        if (Debug::enabled()) {
-            $rows = $res->rowCount();
-            Debug::log("Purged $rows orphaned posts.");
-        }
-    }
+		if (Debug::enabled()) {
+			$rows = $res->rowCount();
+			Debug::log("Purged $rows orphaned posts.");
+		}
+	}
 
 	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 

Spacing +24 added lines, -24 removed lines

@@ -30,7 +30,7 @@ 
 	public static function create_published_article($title, $url, $content, $labels_str,
 			$owner_uid) {
 
-		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
+		$guid = 'SHA1:'.sha1("ttshared:".$url.$owner_uid); // include owner_uid to prevent global GUID clash
 
 		if (!$content) {
 			$pluginhost = new PluginHost();
@@ -85,12 +85,12 @@ 
 					content = ?, content_hash = ? WHERE id = ?");
 				$sth->execute([$content, $content_hash, $ref_id]);
 
-				if (DB_TYPE == "pgsql"){
+				if (DB_TYPE == "pgsql") {
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
 					$params = [
-						":ts_content" => mb_substr(strip_tags($content ), 0, 900000),
+						":ts_content" => mb_substr(strip_tags($content), 0, 900000),
 						":id" => $ref_id];
 					$sth->execute($params);
 				}
@@ -130,12 +130,12 @@ 
 
 			if ($row = $sth->fetch()) {
 				$ref_id = $row["id"];
-				if (DB_TYPE == "pgsql"){
+				if (DB_TYPE == "pgsql") {
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
 					$params = [
-						":ts_content" => mb_substr(strip_tags($content ), 0, 900000),
+						":ts_content" => mb_substr(strip_tags($content), 0, 900000),
 						":id" => $ref_id];
 					$sth->execute($params);
 				}
@@ -173,7 +173,7 @@ 
 		print_hidden("op", "article");
 		print_hidden("method", "setArticleTags");
 
-		print "<header class='horizontal'>" . __("Tags for this article (separated by commas):")."</header>";
+		print "<header class='horizontal'>".__("Tags for this article (separated by commas):")."</header>";
 
 		print "<section>";
 		print "<textarea dojoType='dijit.form.SimpleTextarea' rows='4'
@@ -194,7 +194,7 @@ 
 
 	public function setScore() {
 		$ids = explode(",", clean($_REQUEST['id']));
-		$score = (int)clean($_REQUEST['score']);
+		$score = (int) clean($_REQUEST['score']);
 
 		$ids_qmarks = arr_qmarks($ids);
 
@@ -203,7 +203,7 @@ 
 
 		$sth->execute(array_merge([$score], $ids, [$_SESSION['uid']]));
 
-		print json_encode(["id" => $ids, "score" => (int)$score]);
+		print json_encode(["id" => $ids, "score" => (int) $score]);
 	}
 
 	public function getScore() {
@@ -215,7 +215,7 @@ 
 
 		$score = $row['score'];
 
-		print json_encode(["id" => $id, "score" => (int)$score]);
+		print json_encode(["id" => $id, "score" => (int) $score]);
 	}
 
 
@@ -293,7 +293,7 @@ 
 
 		print "<ul>";
 		while ($line = $sth->fetch()) {
-			print "<li>" . $line["tag_name"] . "</li>";
+			print "<li>".$line["tag_name"]."</li>";
 		}
 		print "</ul>";
 	}
@@ -432,21 +432,21 @@ 
 								if (!$hide_images) {
 									$encsize = '';
 									if ($entry['height'] > 0)
-										$encsize .= ' height="' . intval($entry['height']) . '"';
+										$encsize .= ' height="'.intval($entry['height']).'"';
 									if ($entry['width'] > 0)
-										$encsize .= ' width="' . intval($entry['width']) . '"';
+										$encsize .= ' width="'.intval($entry['width']).'"';
 									$rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
-										src=\"" .htmlspecialchars($entry["url"]) . "\"
-										" . $encsize . " /></p>";
+										src=\"" .htmlspecialchars($entry["url"])."\"
+										" . $encsize." /></p>";
 								} else {
 									$rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
 										href=\"".htmlspecialchars($entry["url"])."\"
-										>" .htmlspecialchars($entry["url"]) . "</a></p>";
+										>" .htmlspecialchars($entry["url"])."</a></p>";
 								}
 
 								if ($entry['title']) {
-									$rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
+									$rv .= "<div class=\"enclosure_title\">${entry['title']}</div>";
 								}
 							}
 						}
@@ -461,13 +461,13 @@ 
 			}
 
 			$rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Attachments')."</span>";
+				"<span>".__('Attachments')."</span>";
 
 			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
 			foreach ($entries as $entry) {
 				if ($entry["title"])
-					$title = " &mdash; " . truncate_string($entry["title"], 30);
+					$title = " &mdash; ".truncate_string($entry["title"], 30);
 				else
 					$title = "";
 
@@ -477,7 +477,7 @@ 
 					$filename = "";
 
 				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
-					dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
+					dojoType=\"dijit.MenuItem\">".$filename.$title."</div>";
 
 			};
 
@@ -546,10 +546,10 @@ 
 			$tags_str = "";
 
 			for ($i = 0; $i < $maxtags; $i++) {
-				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
+				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">".$tags[$i]."</a>, ";
 			}
 
-			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
+			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str) - 2);
 
 			if (count($tags) > $maxtags)
 				$tags_str .= ", &hellip;";
@@ -741,7 +741,7 @@ 
 		if (!$article_image && !$article_stream) {
 			$tmpdoc = new DOMDocument();
 
-			if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">' . mb_substr($content, 0, 131070))) {
+			if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">'.mb_substr($content, 0, 131070))) {
 				$tmpxpath = new DOMXPath($tmpdoc);
 				$elems = $tmpxpath->query('(//img[@src]|//video[@poster]|//iframe[contains(@src , "youtube.com/embed/")])');
 
@@ -749,8 +749,8 @@ 
 					if ($e->nodeName == "iframe") {
 						$matches = [];
 						if (preg_match("/\/embed\/([\w-]+)/", $e->getAttribute("src"), $matches)) {
-							$article_image = "https://img.youtube.com/vi/" . $matches[1] . "/hqdefault.jpg";
-							$article_stream = "https://youtu.be/" . $matches[1];
+							$article_image = "https://img.youtube.com/vi/".$matches[1]."/hqdefault.jpg";
+							$article_stream = "https://youtu.be/".$matches[1];
 							break;
 						}
 					} else if ($e->nodeName == "video") {

Braces +90 added lines, -53 removed lines

@@ -57,10 +57,16 @@ 
 
 		$rc = false;
 
-		if (!$title) $title = $url;
-		if (!$title && !$url) return false;
+		if (!$title) {
+			$title = $url;
+		}
+		if (!$title && !$url) {
+			return false;
+		}
 
-		if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) return false;
+		if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) {
+			return false;
+		}
 
 		$pdo = Db::pdo();
 
@@ -271,7 +277,9 @@ 
 		$tags_str = $this->format_tags_string($tags);
 		$tags_str_full = join(", ", $tags);
 
-		if (!$tags_str_full) $tags_str_full = __("no tags");
+		if (!$tags_str_full) {
+			$tags_str_full = __("no tags");
+		}
 
 		print json_encode([
 			"id" => (int) $id,
@@ -320,10 +328,11 @@ 
 
 			foreach ($ids as $id) {
 
-				if ($assign)
-					Labels::add_article($id, $label, $_SESSION["uid"]);
-				else
-					Labels::remove_article($id, $label, $_SESSION["uid"]);
+				if ($assign) {
+									Labels::add_article($id, $label, $_SESSION["uid"]);
+				} else {
+									Labels::remove_article($id, $label, $_SESSION["uid"]);
+				}
 
 				$labels = $this->get_article_labels($id, $_SESSION["uid"]);
 
@@ -384,14 +393,18 @@ 
 				$width = $line["width"];
 				$height = $line["height"];
 
-				if (!$ctype) $ctype = __("unknown type");
+				if (!$ctype) {
+					$ctype = __("unknown type");
+				}
 
 				//$filename = substr($url, strrpos($url, "/")+1);
 				$filename = basename($url);
 
 				$player = format_inline_player($url, $ctype);
 
-				if ($player) array_push($entries_inline, $player);
+				if ($player) {
+					array_push($entries_inline, $player);
+				}
 
 #				$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
 #					$filename . " (" . $ctype . ")" . "</a>";
@@ -419,8 +432,9 @@ 
 
 					foreach ($entries as $entry) {
 
-						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
-							$retval = $plugin->hook_render_enclosure($entry, $hide_images);
+						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin) {
+													$retval = $plugin->hook_render_enclosure($entry, $hide_images);
+						}
 
 
 						if ($retval) {
@@ -431,10 +445,12 @@ 
 
 								if (!$hide_images) {
 									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="' . intval($entry['height']) . '"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="' . intval($entry['width']) . '"';
+									if ($entry['height'] > 0) {
+																			$encsize .= ' height="' . intval($entry['height']) . '"';
+									}
+									if ($entry['width'] > 0) {
+																			$encsize .= ' width="' . intval($entry['width']) . '"';
+									}
 									$rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"]) . "\"
@@ -466,15 +482,17 @@ 
 			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
 			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; " . truncate_string($entry["title"], 30);
-				else
-					$title = "";
+				if ($entry["title"]) {
+									$title = " &mdash; " . truncate_string($entry["title"], 30);
+				} else {
+									$title = "";
+				}
 
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
+				if ($entry["filename"]) {
+									$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+				} else {
+									$filename = "";
+				}
 
 				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
@@ -492,7 +510,9 @@ 
 
 		$a_id = $id;
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -510,7 +530,9 @@ 
 				WHERE ref_id = ? AND owner_uid = ?");
 			$csth->execute([$id, $owner_uid]);
 
-			if ($row = $csth->fetch()) $tag_cache = $row["tag_cache"];
+			if ($row = $csth->fetch()) {
+				$tag_cache = $row["tag_cache"];
+			}
 		}
 
 		if ($tag_cache) {
@@ -551,8 +573,9 @@ 
 
 			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
 
-			if (count($tags) > $maxtags)
-				$tags_str .= ", &hellip;";
+			if (count($tags) > $maxtags) {
+							$tags_str .= ", &hellip;";
+			}
 
 			return $tags_str;
 		}
@@ -560,7 +583,9 @@ 
 
 	public static function format_article_labels($labels) {
 
-		if (!is_array($labels)) return '';
+		if (!is_array($labels)) {
+			return '';
+		}
 
 		$labels_str = "";
 
@@ -618,10 +643,11 @@ 
 
         // purge orphaned posts in main content table
 
-        if (DB_TYPE == "mysql")
-            $limit_qpart = "LIMIT 5000";
-        else
-            $limit_qpart = "";
+        if (DB_TYPE == "mysql") {
+                    $limit_qpart = "LIMIT 5000";
+        } else {
+                    $limit_qpart = "";
+        }
 
         $pdo = Db::pdo();
         $res = $pdo->query("DELETE FROM ttrss_entries WHERE
@@ -635,7 +661,9 @@ 
 
 	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -685,7 +713,9 @@ 
 	public static function get_article_labels($id, $owner_uid = false) {
 		$rv = array();
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -699,10 +729,11 @@ 
 			if ($label_cache) {
 				$tmp = json_decode($label_cache, true);
 
-				if (!$tmp || $tmp["no-labels"] == 1)
-					return $rv;
-				else
-					return $tmp;
+				if (!$tmp || $tmp["no-labels"] == 1) {
+									return $rv;
+				} else {
+									return $tmp;
+				}
 			}
 		}
 
@@ -721,10 +752,11 @@ 
 			array_push($rv, $rk);
 		}
 
-		if (count($rv) > 0)
-			Labels::update_cache($owner_uid, $id, $rv);
-		else
-			Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
+		if (count($rv) > 0) {
+					Labels::update_cache($owner_uid, $id, $rv);
+		} else {
+					Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
+		}
 
 		return $rv;
 	}
@@ -772,28 +804,33 @@ 
 				}
 			}
 
-			if (!$article_image)
-				foreach ($enclosures as $enc) {
+			if (!$article_image) {
+							foreach ($enclosures as $enc) {
 					if (strpos($enc["content_type"], "image/") !== FALSE) {
 						$article_image = $enc["content_url"];
+			}
 						break;
 					}
 				}
 
-			if ($article_image)
-				$article_image = rewrite_relative_url($site_url, $article_image);
+			if ($article_image) {
+							$article_image = rewrite_relative_url($site_url, $article_image);
+			}
 
-			if ($article_stream)
-				$article_stream = rewrite_relative_url($site_url, $article_stream);
+			if ($article_stream) {
+							$article_stream = rewrite_relative_url($site_url, $article_stream);
+			}
 		}
 
 		$cache = new DiskCache("images");
 
-		if ($article_image && $cache->exists(sha1($article_image)))
-			$article_image = $cache->getUrl(sha1($article_image));
+		if ($article_image && $cache->exists(sha1($article_image))) {
+					$article_image = $cache->getUrl(sha1($article_image));
+		}
 
-		if ($article_stream && $cache->exists(sha1($article_stream)))
-			$article_stream = $cache->getUrl(sha1($article_stream));
+		if ($article_stream && $cache->exists(sha1($article_stream))) {
+					$article_stream = $cache->getUrl(sha1($article_stream));
+		}
 
 		return [$article_image, $article_stream];
 	}

classes/api.php

Spacing +21 added lines, -22 removed lines

@@ -74,11 +74,11 @@ 
 		}
 
 		if (get_pref("ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user($login, $password, false,  Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
+			if (authenticate_user($login, $password, false, Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
 				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
-				$this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
+				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
 				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
@@ -169,7 +169,7 @@ 
 			}
 		}
 
-		foreach (array(-2,-1,0) as $cat_id) {
+		foreach (array(-2, -1, 0) as $cat_id) {
 			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
 				$unread = getFeedUnread($cat_id, true);
 
@@ -190,11 +190,11 @@ 
 
 			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
 
-			$limit = (int)clean($_REQUEST["limit"]);
+			$limit = (int) clean($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 200) $limit = 200;
 
-			$offset = (int)clean($_REQUEST["skip"]);
+			$offset = (int) clean($_REQUEST["skip"]);
 			$filter = clean($_REQUEST["filter"]);
 			$is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
 			$show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
@@ -202,14 +202,14 @@ 
 			/* all_articles, unread, adaptive, marked, updated */
 			$view_mode = clean($_REQUEST["view_mode"]);
 			$include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
-			$since_id = (int)clean($_REQUEST["since_id"]);
+			$since_id = (int) clean($_REQUEST["since_id"]);
 			$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
 			$sanitize_content = !isset($_REQUEST["sanitize"]) ||
 				API::param_to_bool($_REQUEST["sanitize"]);
 			$force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
 			$has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
-			$excerpt_length = (int)clean($_REQUEST["excerpt_length"]);
-			$check_first_id = (int)clean($_REQUEST["check_first_id"]);
+			$excerpt_length = (int) clean($_REQUEST["excerpt_length"]);
+			$check_first_id = (int) clean($_REQUEST["check_first_id"]);
 			$include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
 
 			$_SESSION['hasSandbox'] = $has_sandbox;
@@ -253,7 +253,7 @@ 
 		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
 		$mode = (int) clean($_REQUEST["mode"]);
 		$data = clean($_REQUEST["data"]);
-		$field_raw = (int)clean($_REQUEST["field"]);
+		$field_raw = (int) clean($_REQUEST["field"]);
 
 		$field = "";
 		$set_to = "";
@@ -360,7 +360,7 @@ 
 					"updated" => (int) strtotime($line["updated"]),
 					"feed_id" => $line["feed_id"],
 					"attachments" => $attachments,
-					"score" => (int)$line["score"],
+					"score" => (int) $line["score"],
 					"feed_title" => $line["feed_title"],
 					"note" => $line["note"],
 					"lang" => $line["lang"]
@@ -434,7 +434,7 @@ 
 	}
 
 	public function getLabels() {
-		$article_id = (int)clean($_REQUEST['article_id']);
+		$article_id = (int) clean($_REQUEST['article_id']);
 
 		$rv = array();
 
@@ -459,7 +459,7 @@ 
 			}
 
 			array_push($rv, array(
-				"id" => (int)Labels::label_to_feed_id($line['id']),
+				"id" => (int) Labels::label_to_feed_id($line['id']),
 				"caption" => $line['caption'],
 				"fg_color" => $line['fg_color'],
 				"bg_color" => $line['bg_color'],
@@ -644,10 +644,10 @@ 
 					$row = array(
 							"feed_url" => $line["feed_url"],
 							"title" => $line["title"],
-							"id" => (int)$line["id"],
-							"unread" => (int)$unread,
+							"id" => (int) $line["id"],
+							"unread" => (int) $unread,
 							"has_icon" => $has_icon,
-							"cat_id" => (int)$line["cat_id"],
+							"cat_id" => (int) $line["cat_id"],
 							"last_updated" => (int) strtotime($line["last_updated"]),
 							"order_id" => (int) $line["order_id"],
 						);
@@ -748,12 +748,12 @@ 
 					if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
 
 					$headline_row = array(
-						"id" => (int)$line["id"],
+						"id" => (int) $line["id"],
 						"guid" => $line["guid"],
 						"unread" => API::param_to_bool($line["unread"]),
 						"marked" => API::param_to_bool($line["marked"]),
 						"published" => API::param_to_bool($line["published"]),
-						"updated" => (int)strtotime($line["updated"]),
+						"updated" => (int) strtotime($line["updated"]),
 						"is_updated" => $is_updated,
 						"title" => $line["title"],
 						"link" => $line["link"],
@@ -786,17 +786,16 @@ 
 
 					$headline_row["labels"] = $labels;
 
-					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
-						$feed_title;
+					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : $feed_title;
 
-					$headline_row["comments_count"] = (int)$line["num_comments"];
+					$headline_row["comments_count"] = (int) $line["num_comments"];
 					$headline_row["comments_link"] = $line["comments"];
 
 					$headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
 
 					$headline_row["author"] = $line["author"];
 
-					$headline_row["score"] = (int)$line["score"];
+					$headline_row["score"] = (int) $line["score"];
 					$headline_row["note"] = $line["note"];
 					$headline_row["lang"] = $line["lang"];
 
@@ -858,7 +857,7 @@ 
 		$_REQUEST['mode'] = 2;
 		$_REQUEST['force_show_empty'] = $include_empty;
 
-		if ($pf){
+		if ($pf) {
 			$data = $pf->makefeedtree();
 			$this->wrap(self::STATUS_OK, array("categories" => $data));
 		} else {

classes/feeds.php

Indentation +77 added lines, -77 removed lines

@@ -5,9 +5,9 @@ 
 	const NEVER_GROUP_FEEDS = [ -6, 0 ];
 	const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
 
-    private $params;
+	private $params;
 
-    function csrf_ignore($method) {
+	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "quickaddfeed", "search");
 
 		return array_search($method, $csrf_ignored) !== false;
@@ -101,7 +101,7 @@ 
 		//$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
 
 		$reply .= "<option value=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
-            __('Show as feed')."</option>";
+			__('Show as feed')."</option>";
 
 		$reply .= "</select>";
 
@@ -133,10 +133,10 @@ 
 		$method_split = explode(":", $method);
 
 		if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
-            $sth = $this->pdo->prepare("UPDATE ttrss_feeds
+			$sth = $this->pdo->prepare("UPDATE ttrss_feeds
                             SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                             WHERE id = ?");
-            $sth->execute([$feed]);
+			$sth->execute([$feed]);
 		}
 
 		if ($method_split[0] == "MarkAllReadGR")  {
@@ -197,7 +197,7 @@ 
 				"include_children" => $include_children,
 				"check_first_id" => $check_first_id,
 				"skip_first_id_check" => $skip_first_id_check,
-                "order_by" => $order_by
+				"order_by" => $order_by
 			);
 
 			$qfh_ret = $this->queryFeedHeadlines($params);
@@ -235,7 +235,7 @@ 
 
 		$headlines_count = 0;
 
-        if (is_object($result)) {
+		if (is_object($result)) {
 			while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
 
 				++$headlines_count;
@@ -248,7 +248,7 @@ 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 						$line = $p->hook_query_headlines($line, 250, false);
 					}
-                }
+				}
 
 				$id = $line["id"];
 
@@ -295,53 +295,53 @@ 
 
 				if (!$line["feed_title"]) $line["feed_title"] = "";
 
-                $line["buttons_left"] = "";
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
-                    $line["buttons_left"] .= $p->hook_article_left_button($line);
-                }
+				$line["buttons_left"] = "";
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
+					$line["buttons_left"] .= $p->hook_article_left_button($line);
+				}
 
-                $line["buttons"] = "";
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
-                    $line["buttons"] .= $p->hook_article_button($line);
-                }
+				$line["buttons"] = "";
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
+					$line["buttons"] .= $p->hook_article_button($line);
+				}
 
-                $line["content"] = sanitize($line["content"],
-                    $line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
+				$line["content"] = sanitize($line["content"],
+					$line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
 
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
-                    $line = $p->hook_render_article_cdm($line);
-                }
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
+					$line = $p->hook_render_article_cdm($line);
+				}
 
-                $line['content'] = DiskCache::rewriteUrls($line['content']);
+				$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-                if ($line['note'])
-                    $line['note'] = Article::format_article_note($id, $line['note']);
-                else
-                    $line['note'] = "";
+				if ($line['note'])
+					$line['note'] = Article::format_article_note($id, $line['note']);
+				else
+					$line['note'] = "";
 
-                if (!get_pref("CDM_EXPANDED")) {
-                    $line["cdm_excerpt"] = "<span class='collapse'>
+				if (!get_pref("CDM_EXPANDED")) {
+					$line["cdm_excerpt"] = "<span class='collapse'>
                         <i class='material-icons' onclick='return Article.cdmUnsetActive(event)'
                             title=\"" . __("Collapse article") . "\">remove_circle</i></span>";
 
-                    if (get_pref('SHOW_CONTENT_PREVIEW')) {
-                        $line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
-                    }
-                }
+					if (get_pref('SHOW_CONTENT_PREVIEW')) {
+						$line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
+					}
+				}
 
-                $line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
-                    $line["content"], $line["hide_images"]);
+				$line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
+					$line["content"], $line["hide_images"]);
 
-                if ($line["orig_feed_id"]) {
+				if ($line["orig_feed_id"]) {
 
-                    $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+					$ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
                     WHERE id = ? AND owner_uid = ?");
-                    $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
+					$ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
 
-                    if ($tmp_line = $ofgh->fetch()) {
-                        $line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
-                    }
-                }
+					if ($tmp_line = $ofgh->fetch()) {
+						$line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
+					}
+				}
 
 				$line["updated_long"] = make_local_datetime($line["updated"],true);
 				$line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
@@ -363,7 +363,7 @@ 
 					$line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>";
 				}
 
-			    //setting feed headline background color, needs to change text color based on dark/light
+				//setting feed headline background color, needs to change text color based on dark/light
 				$fav_color = $line['favicon_avg_color'];
 
 				require_once "colors.php";
@@ -377,18 +377,18 @@ 
 				}
 
 				if (isset($rgba_cache[$feed_id])) {
-				    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
-                }
+					$line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
+				}
 
 				/* we don't need those */
 
-                foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-                             "uuid", "label_cache", "yyiw"] as $k)
-                    unset($line[$k]);
+				foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
+							 "uuid", "label_cache", "yyiw"] as $k)
+					unset($line[$k]);
 
 				array_push($reply['content'], $line);
 			}
-        }
+		}
 
 		if (!$headlines_count) {
 
@@ -570,7 +570,7 @@ 
 		$reply['headlines']['is_cat'] = (bool) $cat_view;
 
 		$reply['headlines-info'] = ["count" => (int) $headlines_count,
-            						"disable_cache" => (bool) $disable_cache];
+									"disable_cache" => (bool) $disable_cache];
 
 		// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
 		$reply['runtime-info'] = make_runtime_info();
@@ -578,9 +578,9 @@ 
 		$reply_json = json_encode($reply);
 
 		if (!$reply_json) {
-		    $reply_json = json_encode(["error" => ["code" => 15,
-                "message" => json_last_error_msg()]]);
-        }
+			$reply_json = json_encode(["error" => ["code" => 15,
+				"message" => json_last_error_msg()]]);
+		}
 
 		print $reply_json;
 
@@ -780,9 +780,9 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if (!$sth->fetch()) {
-		    print "Access denied.";
-		    return;
-        }
+			print "Access denied.";
+			return;
+		}
 
 		$refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
 		$rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
@@ -1230,7 +1230,7 @@ 
 				} else {
 					$icon = self::getIconFile($id);
 
-                    if ($icon && file_exists($icon)) {
+					if ($icon && file_exists($icon)) {
 						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
 					}
 				}
@@ -1240,7 +1240,7 @@ 
 	}
 
 	public static function getFeedTitle($id, $cat = false) {
-	    $pdo = Db::pdo();
+		$pdo = Db::pdo();
 
 		if ($cat) {
 			return Feeds::getCategoryTitle($id);
@@ -1271,10 +1271,10 @@ 
 
 		} else if (is_numeric($id) && $id > 0) {
 
-		    $sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
-		    $sth->execute([$id]);
+			$sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
+			$sth->execute([$id]);
 
-		    if ($row = $sth->fetch()) {
+			if ($row = $sth->fetch()) {
 				return $row["title"];
 			} else {
 				return "Unknown feed ($id)";
@@ -1293,7 +1293,7 @@ 
 
 		if ($cat >= 0) {
 
-		    if (!$cat) $cat = null;
+			if (!$cat) $cat = null;
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -1333,7 +1333,7 @@ 
 				WHERE article_id = ref_id AND unread = true
 					AND ttrss_user_entries.owner_uid = ?");
 			$sth->execute([$owner_uid]);
-            $row = $sth->fetch();
+			$row = $sth->fetch();
 
 			return $row["unread"];
 		}
@@ -1381,7 +1381,7 @@ 
 			return __("Labels");
 		} else {
 
-		    $pdo = Db::pdo();
+			$pdo = Db::pdo();
 
 			$sth = $pdo->prepare("SELECT title FROM ttrss_feed_categories WHERE
 				id = ?");
@@ -1417,7 +1417,7 @@ 
 		$pdo = Db::pdo();
 
 		// WARNING: due to highly dynamic nature of this query its going to quote parameters
-        // right before adding them to SQL part
+		// right before adding them to SQL part
 
 		$feed = $params["feed"];
 		$limit = isset($params["limit"]) ? $params["limit"] : 30;
@@ -1661,7 +1661,7 @@ 
 					$ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated
 							FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
 					$ssth->execute([$feed, $owner_uid]);
-                    $row = $ssth->fetch();
+					$row = $ssth->fetch();
 
 					$feed_title = $row["title"];
 					$feed_site_url = $row["site_url"];
@@ -1899,9 +1899,9 @@ 
 	public static function getFeedCategory($feed) {
 		$pdo = Db::pdo();
 
-	    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+		$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 				WHERE id = ?");
-	    $sth->execute([$feed]);
+		$sth->execute([$feed]);
 
 		if ($row = $sth->fetch()) {
 			return $row["cat_id"];
@@ -1911,20 +1911,20 @@ 
 
 	}
 
-    function color_of($name) {
-        $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
-            "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
-            "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
+	function color_of($name) {
+		$colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
+			"#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
+			"#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
 
-        $sum = 0;
+		$sum = 0;
 
-        for ($i = 0; $i < strlen($name); $i++) {
-            $sum += ord($name[$i]);
-        }
+		for ($i = 0; $i < strlen($name); $i++) {
+			$sum += ord($name[$i]);
+		}
 
-        $sum %= count($colormap);
+		$sum %= count($colormap);
 
-        return $colormap[$sum];
+		return $colormap[$sum];
 	}
 
 	public static function get_feeds_from_html($url, $content) {

Switch Indentation +138 added lines, -138 removed lines

@@ -398,21 +398,21 @@ 
 					$message = $query_error_override;
 				} else {
 					switch ($view_mode) {
-						case "unread":
-							$message = __("No unread articles found to display.");
-							break;
-						case "updated":
-							$message = __("No updated articles found to display.");
-							break;
-						case "marked":
-							$message = __("No starred articles found to display.");
-							break;
-						default:
-							if ($feed < LABEL_BASE_INDEX) {
-								$message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
-							} else {
-								$message = __("No articles found to display.");
-							}
+					case "unread":
+						$message = __("No unread articles found to display.");
+						break;
+					case "updated":
+						$message = __("No updated articles found to display.");
+						break;
+					case "marked":
+						$message = __("No starred articles found to display.");
+						break;
+					default:
+						if ($feed < LABEL_BASE_INDEX) {
+							$message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
+						} else {
+							$message = __("No articles found to display.");
+						}
 					}
 				}
 
@@ -874,29 +874,29 @@ 
 		// TODO: all this interval stuff needs some generic generator function
 
 		switch ($mode) {
-			case "1day":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-				}
-				break;
-			case "1week":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
-				}
-				break;
-			case "2week":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
-				}
-				break;
-			default:
-				$date_qpart = "true";
+		case "1day":
+			if (DB_TYPE == "pgsql") {
+				$date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
+			} else {
+				$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+			}
+			break;
+		case "1week":
+			if (DB_TYPE == "pgsql") {
+				$date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
+			} else {
+				$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
+			}
+			break;
+		case "2week":
+			if (DB_TYPE == "pgsql") {
+				$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
+			} else {
+				$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
+			}
+			break;
+		default:
+			$date_qpart = "true";
 		}
 
 		if (is_numeric($feed)) {
@@ -1212,28 +1212,28 @@ 
 
 	public static function getFeedIcon($id) {
 		switch ($id) {
-			case 0:
-				return "archive";
-			case -1:
-				return "star";
-			case -2:
-				return "rss_feed";
-			case -3:
-				return "whatshot";
-			case -4:
-				return "inbox";
-			case -6:
-				return "restore";
-			default:
-				if ($id < LABEL_BASE_INDEX) {
-					return "label";
-				} else {
-					$icon = self::getIconFile($id);
+		case 0:
+			return "archive";
+		case -1:
+			return "star";
+		case -2:
+			return "rss_feed";
+		case -3:
+			return "whatshot";
+		case -4:
+			return "inbox";
+		case -6:
+			return "restore";
+		default:
+			if ($id < LABEL_BASE_INDEX) {
+				return "label";
+			} else {
+				$icon = self::getIconFile($id);
 
                     if ($icon && file_exists($icon)) {
-						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
-					}
+					return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
 				}
+			}
 		}
 
 		return false;
@@ -2201,102 +2201,102 @@ 
 			$commandpair = explode(":", mb_strtolower($k), 2);
 
 			switch ($commandpair[0]) {
-				case "title":
-					if ($commandpair[1]) {
-						array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+			case "title":
+				if ($commandpair[1]) {
+					array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
+						$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						array_push($search_words, $k);
-					}
-					break;
-				case "author":
-					if ($commandpair[1]) {
-						array_push($query_keywords, "($not (LOWER(author) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+					array_push($search_words, $k);
+				}
+				break;
+			case "author":
+				if ($commandpair[1]) {
+					array_push($query_keywords, "($not (LOWER(author) LIKE ".
+						$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						array_push($search_words, $k);
-					}
-					break;
-				case "note":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-						else if ($commandpair[1] == "false")
-							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-						else
-							array_push($query_keywords, "($not (LOWER(note) LIKE ".
-								$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+					array_push($search_words, $k);
+				}
+				break;
+			case "note":
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+					else if ($commandpair[1] == "false")
+						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+					else
+						array_push($query_keywords, "($not (LOWER(note) LIKE ".
+							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "star":
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			case "star":
 
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (marked = true))");
-						else
-							array_push($query_keywords, "($not (marked = false))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (marked = true))");
+					else
+						array_push($query_keywords, "($not (marked = false))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "pub":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (published = true))");
-						else
-							array_push($query_keywords, "($not (published = false))");
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			case "pub":
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (published = true))");
+					else
+						array_push($query_keywords, "($not (published = false))");
 
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "unread":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (unread = true))");
-						else
-							array_push($query_keywords, "($not (unread = false))");
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			case "unread":
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (unread = true))");
+					else
+						array_push($query_keywords, "($not (unread = false))");
 
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				default:
-					if (strpos($k, "@") === 0) {
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			default:
+				if (strpos($k, "@") === 0) {
 
-						$user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
-						$orig_ts = strtotime(substr($k, 1));
-						$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
+					$user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
+					$orig_ts = strtotime(substr($k, 1));
+					$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
-						//$k = date("Y-m-d", strtotime(substr($k, 1)));
+					//$k = date("Y-m-d", strtotime(substr($k, 1)));
 
-						array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
-					} else {
+					array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+				} else {
 
-						if (DB_TYPE == "pgsql") {
-							$k = mb_strtolower($k);
-							array_push($search_query_leftover, $not ? "!$k" : $k);
-						} else {
-							array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+					if (DB_TYPE == "pgsql") {
+						$k = mb_strtolower($k);
+						array_push($search_query_leftover, $not ? "!$k" : $k);
+					} else {
+						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						}
-
-						if (!$not) array_push($search_words, $k);
 					}
+
+					if (!$not) array_push($search_words, $k);
+				}
 			}
 		}
 

Spacing +43 added lines, -43 removed lines

@@ -2,8 +2,8 @@ 
 require_once "colors.php";
 
 class Feeds extends Handler_Protected {
-	const NEVER_GROUP_FEEDS = [ -6, 0 ];
-	const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
+	const NEVER_GROUP_FEEDS = [ -6, 0];
+	const NEVER_GROUP_BY_DATE = [ -2, -1, -3];
 
     private $params;
 
@@ -27,7 +27,7 @@ 
 
 		$reply = "";
 
-		$rss_link = htmlspecialchars(get_self_url_prefix() .
+		$rss_link = htmlspecialchars(get_self_url_prefix().
 			"/public.php?op=rss&id=$feed_id$cat_q$search_q");
 
 		$reply .= "<span class='left'>";
@@ -49,7 +49,7 @@ 
 		}
 
 		if ($error)
-			$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
+			$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
 
 		$reply .= "</span>";
 		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -139,7 +139,7 @@ 
             $sth->execute([$feed]);
 		}
 
-		if ($method_split[0] == "MarkAllReadGR")  {
+		if ($method_split[0] == "MarkAllReadGR") {
 			$this->catchup_feed($method_split[1], false);
 		}
 
@@ -243,7 +243,7 @@ 
 				if (!get_pref('SHOW_CONTENT_PREVIEW')) {
 					$line["content_preview"] = "";
 				} else {
-					$line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content"]), 250);
+					$line["content_preview"] = "&mdash; ".truncate_string(strip_tags($line["content"]), 250);
 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 						$line = $p->hook_query_headlines($line, 250, false);
@@ -322,10 +322,10 @@ 
                 if (!get_pref("CDM_EXPANDED")) {
                     $line["cdm_excerpt"] = "<span class='collapse'>
                         <i class='material-icons' onclick='return Article.cdmUnsetActive(event)'
-                            title=\"" . __("Collapse article") . "\">remove_circle</i></span>";
+                            title=\"" . __("Collapse article")."\">remove_circle</i></span>";
 
                     if (get_pref('SHOW_CONTENT_PREVIEW')) {
-                        $line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
+                        $line["cdm_excerpt"] .= "<span class='excerpt'>".$line["content_preview"]."</span>";
                     }
                 }
 
@@ -339,11 +339,11 @@ 
                     $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
 
                     if ($tmp_line = $ofgh->fetch()) {
-                        $line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
+                        $line["orig_feed"] = [$tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"]];
                     }
                 }
 
-				$line["updated_long"] = make_local_datetime($line["updated"],true);
+				$line["updated_long"] = make_local_datetime($line["updated"], true);
 				$line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
 
 
@@ -377,7 +377,7 @@ 
 				}
 
 				if (isset($rgba_cache[$feed_id])) {
-				    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
+				    $line['feed_bg_color'] = 'rgba('.implode(",", $rgba_cache[$feed_id]).',0.3)';
                 }
 
 				/* we don't need those */
@@ -421,7 +421,7 @@ 
 
 					$reply['content'] .= "<p><span class=\"text-muted\">";
 
-					$sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+					$sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
                         WHERE owner_uid = ?");
 					$sth->execute([$_SESSION['uid']]);
 					$row = $sth->fetch();
@@ -439,8 +439,8 @@ 
 
 					if ($num_errors > 0) {
 						$reply['content'] .= "<br/>";
-						$reply['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" .
-							__('Some feeds have update errors (click for details)') . "</a>";
+						$reply['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">".
+							__('Some feeds have update errors (click for details)')."</a>";
 					}
 					$reply['content'] .= "</span></p></div>";
 
@@ -635,7 +635,7 @@ 
 		$reply['headlines']['is_cat'] = false;
 
 		$reply['headlines']['toolbar'] = '';
-		$reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";
+		$reply['headlines']['content'] = "<div class='whiteBox'>".$error."</div>";
 
 		$reply['headlines-info'] = array("count" => 0,
 			"unread" => 0,
@@ -669,7 +669,7 @@ 
 		print "<fieldset>";
 
 		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<label class='inline'>" . __('Place in category:') . "</label> ";
+			print "<label class='inline'>".__('Place in category:')."</label> ";
 			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
 		}
 
@@ -678,7 +678,7 @@ 
 		print "</section>";
 
 		print '<div id="feedDlg_feedsContainer" style="display : none">
-				<header>' . __('Available feeds') . '</header>
+				<header>' . __('Available feeds').'</header>
 				<section>
 					<fieldset>
 						<select id="feedDlg_feedContainerSelect"
@@ -743,7 +743,7 @@ 
 
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
-			print "<label class='inline'>" . __("Language:") . "</label>";
+			print "<label class='inline'>".__("Language:")."</label>";
 			print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
 				"dojoType='fox.form.Select' title=\"".__('Used for word stemming')."\"");
 			print "</fieldset>";
@@ -772,7 +772,7 @@ 
 		Debug::set_enabled(true);
 		Debug::set_loglevel($_REQUEST["xdebug"]);
 
-		$feed_id = (int)$_REQUEST["feed_id"];
+		$feed_id = (int) $_REQUEST["feed_id"];
 		@$do_update = $_REQUEST["action"] == "do_update";
 		$csrf_token = $_REQUEST["csrf_token"];
 
@@ -811,7 +811,7 @@ 
 		</script>
 
 			<div class="container">
-				<h1>Feed Debugger: <?php echo "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
+				<h1>Feed Debugger: <?php echo "$feed_id: ".$this->getFeedTitle($feed_id) ?></h1>
 				<div class="content">
 					<form method="GET" action="">
 						<input type="hidden" name="op" value="feeds">
@@ -1074,7 +1074,7 @@ 
 		} else if ($n_feed >= 0) {
 
 			if ($n_feed != 0) {
-				$match_part = "feed_id = " . (int)$n_feed;
+				$match_part = "feed_id = ".(int) $n_feed;
 			} else {
 				$match_part = "feed_id IS NULL";
 			}
@@ -1184,7 +1184,7 @@ 
 					(owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method,auth_pass_encrypted)
 				VALUES (?, ?, ?, ?, ?, ?, 0, false)");
 
-			$sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, (string)$auth_login, (string)$auth_pass]);
+			$sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, (string) $auth_login, (string) $auth_pass]);
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 					AND owner_uid = ?");
@@ -1203,11 +1203,11 @@ 
 	}
 
 	public static function getIconFile($feed_id) {
-		return ICONS_DIR . "/$feed_id.ico";
+		return ICONS_DIR."/$feed_id.ico";
 	}
 
 	public static function feedHasIcon($id) {
-		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
+		return is_file(ICONS_DIR."/$id.ico") && filesize(ICONS_DIR."/$id.ico") > 0;
 	}
 
 	public static function getFeedIcon($id) {
@@ -1231,7 +1231,7 @@ 
 					$icon = self::getIconFile($id);
 
                     if ($icon && file_exists($icon)) {
-						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
+						return ICONS_URL."/".basename($icon)."?".filemtime($icon);
 					}
 				}
 		}
@@ -1303,7 +1303,7 @@ 
 
 			$cat_feeds = array();
 			while ($line = $sth->fetch()) {
-				array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
+				array_push($cat_feeds, "feed_id = ".(int) $line["id"]);
 			}
 
 			if (count($cat_feeds) == 0) return 0;
@@ -1517,7 +1517,7 @@ 
 		}
 
 		if ($limit > 0) {
-			$limit_query_part = "LIMIT " . (int)$limit;
+			$limit_query_part = "LIMIT ".(int) $limit;
 		}
 
 		$allow_archived = false;
@@ -1544,7 +1544,7 @@ 
 							implode(",", $subcats).")";
 
 					} else {
-						$query_strategy_part = "cat_id = " . $pdo->quote($feed);
+						$query_strategy_part = "cat_id = ".$pdo->quote($feed);
 					}
 
 				} else {
@@ -1554,7 +1554,7 @@ 
 				$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 
 			} else {
-				$query_strategy_part = "feed_id = " . $pdo->quote($feed);
+				$query_strategy_part = "feed_id = ".$pdo->quote($feed);
 			}
 		} else if ($feed == 0 && !$cat_view) { // archive virtual feed
 			$query_strategy_part = "feed_id IS NULL";
@@ -1676,7 +1676,7 @@ 
 		$content_query_part = "content, ";
 
 		if ($limit_query_part) {
-			$offset_query_part = "OFFSET " . (int)$offset;
+			$offset_query_part = "OFFSET ".(int) $offset;
 		} else {
 			$offset_query_part = "";
 		}
@@ -1765,7 +1765,7 @@ 
 				$res = $pdo->query($query);
 
 				if ($row = $res->fetch()) {
-					$first_id = (int)$row["id"];
+					$first_id = (int) $row["id"];
 
 					if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
 						return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "", $query_error_override);
@@ -1912,9 +1912,9 @@ 
 	}
 
     function color_of($name) {
-        $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
-            "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
-            "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
+        $colormap = ["#1cd7d7", "#d91111", "#1212d7", "#8e16e5", "#7b7b7b",
+            "#39f110", "#0bbea6", "#ec0e0e", "#1534f2", "#b9e416",
+            "#479af2", "#f36b14", "#10c7e9", "#1e8fe7", "#e22727"];
 
         $sum = 0;
 
@@ -1978,13 +1978,13 @@ 
 
 		// support schema-less urls
 		if (strpos($url, '//') === 0) {
-			$url = 'https:' . $url;
+			$url = 'https:'.$url;
 		}
 
 		if (strpos($url, '://') === false) {
-			$url = 'http://' . $url;
+			$url = 'http://'.$url;
 		} else if (substr($url, 0, 5) == 'feed:') {
-			$url = 'http:' . substr($url, 5);
+			$url = 'http:'.substr($url, 5);
 		}
 
 		//prepend slash if the URL has no slash in it
@@ -2034,7 +2034,7 @@ 
 
 			$sth = $pdo->prepare("INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat,order_id)
 					VALUES (?, ?, ?, ?)");
-			$sth->execute([$_SESSION['uid'], $feed_cat, $parent_cat_id, (int)$order_id]);
+			$sth->execute([$_SESSION['uid'], $feed_cat, $parent_cat_id, (int) $order_id]);
 
 			if (!$tr_in_progress) $pdo->commit();
 
@@ -2134,7 +2134,7 @@ 
 			$sth->execute([$feed_id]);
 
 		} else {
-			$sth  = $pdo->prepare("DELETE FROM ttrss_user_entries
+			$sth = $pdo->prepare("DELETE FROM ttrss_user_entries
 				USING ttrss_user_entries, ttrss_entries
 				WHERE ttrss_entries.id = ref_id AND
 				marked = false AND
@@ -2204,7 +2204,7 @@ 
 				case "title":
 					if ($commandpair[1]) {
 						array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
+							$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
@@ -2214,7 +2214,7 @@ 
 				case "author":
 					if ($commandpair[1]) {
 						array_push($query_keywords, "($not (LOWER(author) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+							$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
@@ -2229,7 +2229,7 @@ 
 							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
 						else
 							array_push($query_keywords, "($not (LOWER(note) LIKE ".
-								$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+								$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
@@ -2306,7 +2306,7 @@ 
 
 				// if there's no joiners consider this a "simple" search and
 				// concatenate everything with &, otherwise don't try to mess with tsquery syntax
-				if (preg_match("/[&|]/", implode(" " , $search_query_leftover))) {
+				if (preg_match("/[&|]/", implode(" ", $search_query_leftover))) {
 					$tsquery = $pdo->quote(implode(" ", $search_query_leftover));
 				} else {
 					$tsquery = $pdo->quote(implode(" & ", $search_query_leftover));

Braces +162 added lines, -85 removed lines

@@ -17,7 +17,9 @@ 
 			$feed_id, $is_cat, $search,
 			$error, $feed_last_updated) {
 
-		if ($is_cat) $cat_q = "&is_cat=$is_cat";
+		if ($is_cat) {
+			$cat_q = "&is_cat=$is_cat";
+		}
 
 		if ($search) {
 			$search_q = "&q=$search";
@@ -48,8 +50,9 @@ 
 			$reply .= strip_tags($feed_title);
 		}
 
-		if ($error)
-			$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
+		if ($error) {
+					$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
+		}
 
 		$reply .= "</span>";
 		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -127,8 +130,12 @@ 
 		$rgba_cache = array();
 		$topmost_article_ids = array();
 
-		if (!$offset) $offset = 0;
-		if ($method == "undefined") $method = "";
+		if (!$offset) {
+			$offset = 0;
+		}
+		if ($method == "undefined") {
+			$method = "";
+		}
 
 		$method_split = explode(":", $method);
 
@@ -274,14 +281,17 @@ 
 					$label_cache = json_decode($label_cache, true);
 
 					if ($label_cache) {
-						if ($label_cache["no-labels"] == 1)
-							$labels = array();
-						else
-							$labels = $label_cache;
+						if ($label_cache["no-labels"] == 1) {
+													$labels = array();
+						} else {
+													$labels = $label_cache;
+						}
 					}
 				}
 
-				if (!is_array($labels)) $labels = Article::get_article_labels($id);
+				if (!is_array($labels)) {
+					$labels = Article::get_article_labels($id);
+				}
 
 				$labels_str = "<span class=\"HLLCTR-$id\">";
 				$labels_str .= Article::format_article_labels($labels);
@@ -293,7 +303,9 @@ 
 					array_push($topmost_article_ids, $id);
 				}
 
-				if (!$line["feed_title"]) $line["feed_title"] = "";
+				if (!$line["feed_title"]) {
+					$line["feed_title"] = "";
+				}
 
                 $line["buttons_left"] = "";
                 foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
@@ -314,10 +326,11 @@ 
 
                 $line['content'] = DiskCache::rewriteUrls($line['content']);
 
-                if ($line['note'])
-                    $line['note'] = Article::format_article_note($id, $line['note']);
-                else
-                    $line['note'] = "";
+                if ($line['note']) {
+                                    $line['note'] = Article::format_article_note($id, $line['note']);
+                } else {
+                                    $line['note'] = "";
+                }
 
                 if (!get_pref("CDM_EXPANDED")) {
                     $line["cdm_excerpt"] = "<span class='collapse'>
@@ -350,10 +363,11 @@ 
 				$line['imported'] = T_sprintf("Imported at %s",
 					make_local_datetime($line["date_entered"], false));
 
-				if ($line["tag_cache"])
-					$tags = explode(",", $line["tag_cache"]);
-				else
-					$tags = false;
+				if ($line["tag_cache"]) {
+									$tags = explode(",", $line["tag_cache"]);
+				} else {
+									$tags = false;
+				}
 
 				$line["tags_str"] = Article::format_tags_string($tags);
 
@@ -383,8 +397,9 @@ 
 				/* we don't need those */
 
                 foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-                             "uuid", "label_cache", "yyiw"] as $k)
-                    unset($line[$k]);
+                             "uuid", "label_cache", "yyiw"] as $k) {
+                                    unset($line[$k]);
+                }
 
 				array_push($reply['content'], $line);
 			}
@@ -474,7 +489,9 @@ 
 		$order_by = $_REQUEST["order_by"];
 		$check_first_id = $_REQUEST["fid"];
 
-		if (is_numeric($feed)) $feed = (int) $feed;
+		if (is_numeric($feed)) {
+			$feed = (int) $feed;
+		}
 
 		/* Feed -5 is a special case: it is used to display auxiliary information
 		 * when there's nothing to load - e.g. no stuff in fresh feed */
@@ -562,10 +579,11 @@ 
 		$disable_cache = $ret[3];
 		$reply['headlines'] = $ret[4];
 
-		if (!$next_unread_feed)
-			$reply['headlines']['id'] = $feed;
-		else
-			$reply['headlines']['id'] = $next_unread_feed;
+		if (!$next_unread_feed) {
+					$reply['headlines']['id'] = $feed;
+		} else {
+					$reply['headlines']['id'] = $next_unread_feed;
+		}
 
 		$reply['headlines']['is_cat'] = (bool) $cat_view;
 
@@ -851,7 +869,9 @@ 
 
 	public static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1026,7 +1046,9 @@ 
 
 		$pdo = Db::pdo();
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		if ($unread_only) {
 			$unread_qpart = "unread = true";
@@ -1142,7 +1164,9 @@ 
 
 		$url = Feeds::fix_url($url);
 
-		if (!$url || !Feeds::validate_feed_url($url)) return array("code" => 2);
+		if (!$url || !Feeds::validate_feed_url($url)) {
+			return array("code" => 2);
+		}
 
 		$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
 
@@ -1170,7 +1194,9 @@ 
 			$url = key($feedUrls);
 		}
 
-		if (!$cat_id) $cat_id = null;
+		if (!$cat_id) {
+			$cat_id = null;
+		}
 
 		$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 			WHERE feed_url = ? AND owner_uid = ?");
@@ -1287,13 +1313,17 @@ 
 
 	public static function getCategoryUnread($cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
 		if ($cat >= 0) {
 
-		    if (!$cat) $cat = null;
+		    if (!$cat) {
+		    	$cat = null;
+		    }
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -1306,7 +1336,9 @@ 
 				array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
 			}
 
-			if (count($cat_feeds) == 0) return 0;
+			if (count($cat_feeds) == 0) {
+				return 0;
+			}
 
 			$match_part = implode(" OR ", $cat_feeds);
 
@@ -1341,7 +1373,9 @@ 
 
 	// only accepts real cats (>= 0)
 	public static function getCategoryChildrenUnread($cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1361,7 +1395,9 @@ 
 
 	public static function getGlobalUnread($user_id = false) {
 
-		if (!$user_id) $user_id = $_SESSION["uid"];
+		if (!$user_id) {
+			$user_id = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1396,7 +1432,9 @@ 
 	}
 
 	public static function getLabelUnread($label_id, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1491,8 +1529,9 @@ 
 
 				$unread = getFeedUnread($feed, $cat_view);
 
-				if ($cat_view && $feed > 0 && $include_children)
-					$unread += Feeds::getCategoryChildrenUnread($feed);
+				if ($cat_view && $feed > 0 && $include_children) {
+									$unread += Feeds::getCategoryChildrenUnread($feed);
+				}
 
 				if ($unread > 0) {
 					$view_query_part = " unread = true AND ";
@@ -1604,7 +1643,9 @@ 
 			$allow_archived = true;
 			$ignore_vfeed_group = true;
 
-			if (!$override_order) $override_order = "last_read DESC";
+			if (!$override_order) {
+				$override_order = "last_read DESC";
+			}
 
 		} else if ($feed == -3) { // fresh virtual feed
 			$query_strategy_part = "unread = true AND score >= 0";
@@ -1715,13 +1756,16 @@ 
 						LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
 			}
 
-			if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,";
+			if ($vfeed_query_part) {
+				$vfeed_query_part .= "favicon_avg_color,";
+			}
 
 			$first_id = 0;
 			$first_id_query_strategy_part = $query_strategy_part;
 
-			if ($feed == -3)
-				$first_id_query_strategy_part = "true";
+			if ($feed == -3) {
+							$first_id_query_strategy_part = "true";
+			}
 
 			if (DB_TYPE == "pgsql") {
 				$sanity_interval_qpart = "date_entered >= NOW() - INTERVAL '1 hour' AND";
@@ -1853,7 +1897,9 @@ 
 							$query_strategy_part ORDER BY $order_by
 							$limit_query_part $offset_query_part";
 
-			if ($_REQUEST["debug"]) print $query;
+			if ($_REQUEST["debug"]) {
+				print $query;
+			}
 
 			$res = $pdo->query($query);
 		}
@@ -2003,18 +2049,23 @@ 
 			}
 		}
 
-		if ($url != "http:///")
-			return $url;
-		else
-			return '';
+		if ($url != "http:///") {
+					return $url;
+		} else {
+					return '';
+		}
 	}
 
 	public static function add_feed_category($feed_cat, $parent_cat_id = false, $order_id = 0) {
 
-		if (!$feed_cat) return false;
+		if (!$feed_cat) {
+			return false;
+		}
 
 		$feed_cat = mb_substr($feed_cat, 0, 250);
-		if (!$parent_cat_id) $parent_cat_id = null;
+		if (!$parent_cat_id) {
+			$parent_cat_id = null;
+		}
 
 		$pdo = Db::pdo();
 		$tr_in_progress = false;
@@ -2036,7 +2087,9 @@ 
 					VALUES (?, ?, ?, ?)");
 			$sth->execute([$_SESSION['uid'], $feed_cat, $parent_cat_id, (int)$order_id]);
 
-			if (!$tr_in_progress) $pdo->commit();
+			if (!$tr_in_progress) {
+				$pdo->commit();
+			}
 
 			return true;
 		}
@@ -2048,7 +2101,9 @@ 
 
 	public static function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$is_cat = bool_to_sql_bool($is_cat);
 
@@ -2086,7 +2141,9 @@ 
 	 */
 	public static function purge_feed($feed_id, $purge_interval) {
 
-		if (!$purge_interval) $purge_interval = Feeds::feed_purge_interval($feed_id);
+		if (!$purge_interval) {
+			$purge_interval = Feeds::feed_purge_interval($feed_id);
+		}
 
 		$pdo = Db::pdo();
 
@@ -2106,7 +2163,9 @@ 
 			return;
 		}
 
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+			return;
+		}
 
 		if (FORCE_ARTICLE_PURGE == 0) {
 			$purge_unread = get_pref("PURGE_UNREAD_ARTICLES",
@@ -2116,10 +2175,11 @@ 
 			$purge_interval = FORCE_ARTICLE_PURGE;
 		}
 
-		if (!$purge_unread)
-			$query_limit = " unread = false AND ";
-		else
-			$query_limit = "";
+		if (!$purge_unread) {
+					$query_limit = " unread = false AND ";
+		} else {
+					$query_limit = "";
+		}
 
 		$purge_interval = (int) $purge_interval;
 
@@ -2166,8 +2226,10 @@ 
 			$purge_interval = $row["purge_interval"];
 			$owner_uid = $row["owner_uid"];
 
-			if ($purge_interval == 0) $purge_interval = get_pref(
+			if ($purge_interval == 0) {
+				$purge_interval = get_pref(
 				'PURGE_OLD_DAYS', $owner_uid);
+			}
 
 			return $purge_interval;
 
@@ -2185,10 +2247,11 @@ 
 
 		$pdo = Db::pdo();
 
-		if ($search_language)
-			$search_language = $pdo->quote(mb_strtolower($search_language));
-		else
-			$search_language = $pdo->quote("english");
+		if ($search_language) {
+					$search_language = $pdo->quote(mb_strtolower($search_language));
+		} else {
+					$search_language = $pdo->quote("english");
+		}
 
 		foreach ($keywords as $k) {
 			if (strpos($k, "-") === 0) {
@@ -2223,56 +2286,68 @@ 
 					break;
 				case "note":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-						else if ($commandpair[1] == "false")
-							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-						else
-							array_push($query_keywords, "($not (LOWER(note) LIKE ".
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+						} else if ($commandpair[1] == "false") {
+													array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+						} else {
+													array_push($query_keywords, "($not (LOWER(note) LIKE ".
 								$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+						}
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				case "star":
 
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (marked = true))");
-						else
-							array_push($query_keywords, "($not (marked = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (marked = true))");
+						} else {
+													array_push($query_keywords, "($not (marked = false))");
+						}
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				case "pub":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (published = true))");
-						else
-							array_push($query_keywords, "($not (published = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (published = true))");
+						} else {
+													array_push($query_keywords, "($not (published = false))");
+						}
 
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				case "unread":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (unread = true))");
-						else
-							array_push($query_keywords, "($not (unread = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (unread = true))");
+						} else {
+													array_push($query_keywords, "($not (unread = false))");
+						}
 
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				default:
@@ -2295,7 +2370,9 @@ 
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
 						}
 
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 			}
 		}

classes/pref/feeds.php

Indentation +2 added lines, -2 removed lines

@@ -1568,8 +1568,8 @@
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
 			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
-                user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
-                return;
+				user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
+				return;
 			}
 		}
 

Spacing +81 added lines, -81 removed lines

@@ -60,8 +60,8 @@ 
 		while ($line = $sth->fetch()) {
 
 			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
+			$cat['id'] = 'CAT:'.$line['id'];
+			$cat['bare_id'] = (int) $line['id'];
 			$cat['name'] = $line['title'];
 			$cat['items'] = array();
 			$cat['checkbox'] = false;
@@ -93,8 +93,8 @@ 
 
 		while ($feed_line = $fsth->fetch()) {
 			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
+			$feed['id'] = 'FEED:'.$feed_line['id'];
+			$feed['bare_id'] = (int) $feed_line['id'];
 			$feed['auxcounter'] = -1;
 			$feed['name'] = $feed_line['title'];
 			$feed['checkbox'] = false;
@@ -103,7 +103,7 @@ 
 			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+			$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 			array_push($items, $feed);
 		}
@@ -151,8 +151,8 @@ 
 					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
 
 					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
+					$item['id'] = 'FEED:'.$feed_id;
+					$item['bare_id'] = (int) $feed_id;
 					$item['auxcounter'] = -1;
 					$item['name'] = $feed['title'];
 					$item['checkbox'] = false;
@@ -216,8 +216,8 @@ 
 
 			while ($line = $sth->fetch()) {
 				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
+				$cat['id'] = 'CAT:'.$line['id'];
+				$cat['bare_id'] = (int) $line['id'];
 				$cat['auxcounter'] = -1;
 				$cat['name'] = $line['title'];
 				$cat['items'] = array();
@@ -261,8 +261,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -272,7 +272,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($cat['items'], $feed);
 			}
@@ -296,8 +296,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -307,7 +307,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($root['items'], $feed);
 			}
@@ -348,11 +348,11 @@ 
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
+		$bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
 
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+				$parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
 				$parent_qpart = $parent_bare_id;
 			} else {
 				$parent_qpart = null;
@@ -371,7 +371,7 @@ 
 		if ($cat && is_array($cat)) {
 			foreach ($cat as $item) {
 				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+				$bare_id = substr($id, strpos($id, ':') + 1);
 
 				Debug::log("$prefix [$order_id] $id/$bare_id");
 
@@ -389,7 +389,7 @@ 
 
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+							$nest_level + 1);
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
@@ -446,7 +446,7 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if ($sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(ICONS_DIR."/$feed_id.ico");
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
 			$sth->execute([$feed_id]);
@@ -457,7 +457,7 @@ 
 		header("Content-type: text/html");
 
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
 
 			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
 				$tmp_file);
@@ -480,8 +480,8 @@ 
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+					@unlink(ICONS_DIR."/$feed_id.ico");
+					if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
 						$sth->execute([$feed_id]);
@@ -540,7 +540,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
+			print "<label>".__('URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -563,7 +563,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Place in category:') . "</label> ";
+				print "<label>".__('Place in category:')."</label> ";
 
 				print_feed_cat_select("cat_id", $cat_id,
 					'dojoType="fox.form.Select"');
@@ -577,7 +577,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
+			print "<label>".__('Site URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -595,7 +595,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
+				print "<label>".__('Language:')."</label> ";
 				print_select("feed_language", $feed_language, $this::get_ts_languages(),
 					'dojoType="fox.form.Select"');
 
@@ -626,10 +626,10 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" ' .
+				'dojoType="fox.form.Select" '.
 				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
 			print "</fieldset>";
@@ -736,7 +736,7 @@ 
 			print "<fieldset class='narrow'>";
 
 			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-				name='cache_images' $checked> ". __('Cache media')."</label>";
+				name='cache_images' $checked> ".__('Cache media')."</label>";
 
 			print "</fieldset>";
 
@@ -818,7 +818,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 
 			print_feed_cat_select("cat_id", false,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -833,7 +833,7 @@ 
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
+			print "<label>".__('Language:')."</label> ";
 			print_select("feed_language", "", $this::get_ts_languages(),
 				'disabled="1" dojoType="fox.form.Select"');
 
@@ -866,7 +866,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", "", $purge_intervals,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -1026,12 +1026,12 @@ 
 					":purge_intl" => $purge_intl,
 					":auth_login" => $auth_login,
 					":auth_pass" => $auth_pass,
-					":private" => (int)$private,
-					":cache_images" => (int)$cache_images,
-					":hide_images" => (int)$hide_images,
-					":include_in_digest" => (int)$include_in_digest,
-					":always_display_enclosures" => (int)$always_display_enclosures,
-					":mark_unread_on_update" => (int)$mark_unread_on_update,
+					":private" => (int) $private,
+					":cache_images" => (int) $cache_images,
+					":hide_images" => (int) $hide_images,
+					":include_in_digest" => (int) $include_in_digest,
+					":always_display_enclosures" => (int) $always_display_enclosures,
+					":mark_unread_on_update" => (int) $mark_unread_on_update,
 					":feed_language" => $feed_language,
 					":id" => $feed_id,
 					":uid" => $_SESSION['uid']]);
@@ -1062,57 +1062,57 @@ 
 
 				switch ($k) {
 					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
+						$qpart = "title = ".$this->pdo->quote($feed_title);
 						break;
 
 					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
 						break;
 
 					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
 						break;
 
 					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
 						break;
 
 					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
 						break;
 
 					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
+						$qpart = "private = ".$this->pdo->quote($private);
 						break;
 
 					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
 						break;
 
 					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
 						break;
 
 					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
 						break;
 
 					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
 						break;
 
 					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
 						break;
 
 					case "cat_id":
 						if (get_pref('ENABLE_FEED_CATS')) {
 							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 							} else {
 								$qpart = 'cat_id = NULL';
 							}
@@ -1123,7 +1123,7 @@ 
 						break;
 
 					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
 						break;
 
 				}
@@ -1184,14 +1184,14 @@ 
 
 			$error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors") . "</button>";
+				__("Feeds with errors")."</button>";
 		}
 
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds") . "</button>";
+				__("Inactive feeds")."</button>";
 
 		$feed_search = clean($_REQUEST["search"]);
 
@@ -1213,7 +1213,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1222,7 +1222,7 @@ 
 		print "</div></div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
+				"<span>".__('Feeds')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
@@ -1238,7 +1238,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
+					"<span>".__('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
@@ -1305,7 +1305,7 @@ 
 		print "<div dojoType='dijit.layout.AccordionPane'
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
+		print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
 
 		print_notice("Only main settings profile can be migrated using OPML.");
 
@@ -1322,7 +1322,7 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML') . "</button>";
+			__('Import OPML')."</button>";
 
 		print "</form>";
 
@@ -1330,22 +1330,22 @@ 
 
 		print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML') . "</button>";
+			__('Export OPML')."</button>";
 
 		print " <label class='checkbox'>";
 		print_checkbox("include_settings", true, "1", "");
-		print " " . __("Include settings");
+		print " ".__("Include settings");
 		print "</label>";
 
 		print "</form>";
 
 		print "<p/>";
 
-		print "<h2>" . __("Published OPML") . "</h2>";
+		print "<h2>".__("Published OPML")."</h2>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
-			" " .
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
+			" ".
+			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
@@ -1358,10 +1358,10 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
+		print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
 
-		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
-				"/public.php?op=rss&id=-2&view-mode=all_articles");;
+		$rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
+				"/public.php?op=rss&id=-2&view-mode=all_articles"); ;
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
@@ -1390,7 +1390,7 @@ 
 			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
 
-		$obj['id'] = 'CAT:' . $cat_id;
+		$obj['id'] = 'CAT:'.$cat_id;
 		$obj['items'] = array();
 		$obj['name'] = Feeds::getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
@@ -1410,7 +1410,7 @@ 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
+		$obj['id'] = 'FEED:'.$feed_id;
 		$obj['name'] = $title;
 		$obj['unread'] = (int) $unread;
 		$obj['type'] = 'feed';
@@ -1446,7 +1446,7 @@ 
 
 		print "<div dojoType='fox.Toolbar'>";
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1503,7 +1503,7 @@ 
 
 		print "<div dojoType=\"fox.Toolbar\">";
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1567,7 +1567,7 @@ 
 
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+			if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
                 user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
 			}
@@ -1599,7 +1599,7 @@ 
 					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 					$row = $res->fetch();
 
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -1631,8 +1631,8 @@ 
 
 			$pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
+			if (file_exists(ICONS_DIR."/$id.ico")) {
+				unlink(ICONS_DIR."/$id.ico");
 			}
 
 			CCache::remove($id, $owner_uid);
@@ -1656,7 +1656,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
 			print "</fieldset>";
 		}
@@ -1665,7 +1665,7 @@ 
 
 		print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
+		print "<header>".__("Authentication")."</header>";
 		print "<section>";
 
 		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
@@ -1784,12 +1784,12 @@ 
 		$sth->execute([$_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
+			print (int) $row["num_inactive"];
 		}
 	}
 
 	public static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
+		$url_path = get_self_url_prefix().
 			"/public.php?op=subscribe&feed_url=%s";
 		return $url_path;
 	}

Braces +40 added lines, -26 removed lines

@@ -42,10 +42,11 @@ 
 
 	private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		// first one is set by API
 		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
@@ -76,8 +77,9 @@ 
 			$num_children = $this->calculate_children_count($cat);
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats)
-				array_push($items, $cat);
+			if ($num_children > 0 || $show_empty_cats) {
+							array_push($items, $cat);
+			}
 
 		}
 
@@ -117,10 +119,11 @@ 
 
 	public function makefeedtree() {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		$root = array();
 		$root['id'] = 'root';
@@ -231,8 +234,9 @@ 
 				$num_children = $this->calculate_children_count($cat);
 				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-				if ($num_children > 0 || $show_empty_cats)
-					array_push($root['items'], $cat);
+				if ($num_children > 0 || $show_empty_cats) {
+									array_push($root['items'], $cat);
+				}
 
 				$root['param'] += count($cat['items']);
 			}
@@ -279,8 +283,9 @@ 
 
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
-			if (count($cat['items']) > 0 || $show_empty_cats)
-				array_push($root['items'], $cat);
+			if (count($cat['items']) > 0 || $show_empty_cats) {
+							array_push($root['items'], $cat);
+			}
 
 			$num_children = $this->calculate_children_count($root);
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
@@ -343,8 +348,9 @@ 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
 		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++)
-			$prefix .= "   ";
+		for ($i = 0; $i < $nest_level; $i++) {
+					$prefix .= "   ";
+		}
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
@@ -409,8 +415,9 @@ 
 		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+		if (!is_array($data['items'])) {
+					$data['items'] = json_decode($data['items'], true);
+		}
 
 #		print_r($data['items']);
 
@@ -494,7 +501,9 @@ 
 			}
 		}
 
-		if (is_file($icon_file)) @unlink($icon_file);
+		if (is_file($icon_file)) {
+			@unlink($icon_file);
+		}
 
 		print $rc;
 		return;
@@ -590,8 +599,9 @@ 
 			if (DB_TYPE == "pgsql") {
 				$feed_language = $row["feed_language"];
 
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				if (!$feed_language) {
+									$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				}
 
 				print "<fieldset>";
 
@@ -1404,11 +1414,13 @@ 
 		$obj = array();
 		$feed_id = (int) $feed_id;
 
-		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+		if (!$title) {
+					$title = Feeds::getFeedTitle($feed_id, false);
+		}
 
-		if ($unread === false)
-			$unread = getFeedUnread($feed_id, false);
+		if ($unread === false) {
+					$unread = getFeedUnread($feed_id, false);
+		}
 
 		$obj['id'] = 'FEED:' . $feed_id;
 		$obj['name'] = $title;
@@ -1738,7 +1750,9 @@ 
 
 
 	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		// clear old value and generate new one
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys

classes/pref/prefs.php

Spacing +25 added lines, -25 removed lines

@@ -82,7 +82,7 @@ 
 			"ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
 			"ENABLE_FEED_CATS" => array(__("Enable categories")),
 			"FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
-			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
+			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>".__("hours")."</strong>"),
 			"HIDE_READ_FEEDS" => array(__("Hide read feeds")),
 			"HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
 			"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 @@ 
 
 			if ($_SESSION["auth_module"] == "auth_internal") {
 
-				print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
+				print "<div dojoType='dijit.layout.ContentPane' title=\"".__('App passwords')."\">";
 
 				print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
 
@@ -415,11 +415,11 @@ 
 
 				print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.generate()\">" .
-					__('Generate new password') . "</button> ";
+					__('Generate new password')."</button> ";
 
 				print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.removeSelected()\">" .
-					__('Remove selected passwords') . "</button>";
+					__('Remove selected passwords')."</button>";
 
 				print "</div>"; # content pane
 			}
@@ -474,13 +474,13 @@ 
 					print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
 
 					if (function_exists("imagecreatefromstring")) {
-						print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
+						print "<h3>".__("Scan the following code by the Authenticator application or copy the key manually")."</h3>";
 
 						$csrf_token = $_SESSION["csrf_token"];
 						print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
 					} else {
 						print_error("PHP GD functions are required to generate QR codes.");
-						print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
+						print "<h3>".__("Use the following OTP key with a compatible Authenticator application")."</h3>";
 					}
 
 					print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
@@ -647,7 +647,7 @@ 
 					print "<fieldset class='prefs'>";
 
 					print "<label for='CB_$pref_name'>";
-					print $item['short_desc'] . ":";
+					print $item['short_desc'].":";
 					print "</label>";
 
 					$value = $item['value'];
@@ -684,7 +684,7 @@ 
 						print "</select>";
 
 						print " <button dojoType=\"dijit.form.Button\" class='alt-info'
-							onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>";
+							onclick=\"Helpers.customizeCSS()\">" . __('Customize')."</button>";
 
 						print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
 							<i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>";
@@ -747,12 +747,12 @@ 
 						$has_serial = ($cert_serial) ? "false" : "true";
 
 						print "<button dojoType='dijit.form.Button' disabled='$has_serial'
-							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" .
-							__('Register') . "</button>";
+							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">".
+							__('Register')."</button>";
 
 						print "<button dojoType='dijit.form.Button' class='alt-danger'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" .
-							__('Clear') . "</button>";
+							__('Clear')."</button>";
 
 						print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'>
@@ -763,7 +763,7 @@ 
 							id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\"
 							name=\"$pref_name\" value=\"$value\">";
 
-						$item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
+						$item['help_text'] .= ". ".T_sprintf("Current server time: %s", date("H:i"));
 					} else {
 						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
@@ -849,7 +849,7 @@ 
 			print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
 		}
 
-		$feed_handler_whitelist = [ "Af_Comics" ];
+		$feed_handler_whitelist = ["Af_Comics"];
 
 		$feed_handlers = array_merge(
 			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
@@ -861,9 +861,9 @@ 
 
 		if (count($feed_handlers) > 0) {
 			print_error(
-				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>" ,
+				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>",
 					implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
-				) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
+				)." (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
 			);
 		}
 
@@ -892,7 +892,7 @@ 
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input disabled='1'
 							dojoType='dijit.form.CheckBox' $checked type='checkbox'>
-						".htmlspecialchars($about[1]). "</label>";
+						".htmlspecialchars($about[1])."</label>";
 
 					if (@$about[4]) {
 						print "<button dojoType='dijit.form.Button' class='alt-info'
@@ -1154,7 +1154,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1192,7 +1192,7 @@ 
 			$is_active = "";
 		}
 
-		print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
+		print "<td width='100%'><span>".__("Default profile")." $is_active</span></td>";
 
 		print "</tr>";
 
@@ -1214,7 +1214,7 @@ 
 
 			print "<td><span dojoType='dijit.InlineEditBox'
 				width='300px' autoSave='false'
-				profile-id='$profile_id'>" . $edit_title .
+				profile-id='$profile_id'>".$edit_title.
 				"<script type='dojo/method' event='onChange' args='item'>
 					var elem = this;
 					dojo.xhrPost({
@@ -1263,13 +1263,13 @@ 
 
 	private function appPasswordList() {
 		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>" .
-			"<span>" . __('Select') . "</span>";
+		print "<div dojoType='fox.form.DropDownButton'>".
+			"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('app-password-list', true)\"
-				dojoType=\"dijit.MenuItem\">" . __('All') . "</div>";
+				dojoType=\"dijit.MenuItem\">" . __('All')."</div>";
 		print "<div onclick=\"Tables.select('app-password-list', false)\"
-				dojoType=\"dijit.MenuItem\">" . __('None') . "</div>";
+				dojoType=\"dijit.MenuItem\">" . __('None')."</div>";
 		print "</div></div>";
 		print "</div>"; #toolbar
 
@@ -1294,7 +1294,7 @@ 
 
 			print "<td align='center'>
 						<input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
-			print "<td>" . htmlspecialchars($row["title"]) . "</td>";
+			print "<td>".htmlspecialchars($row["title"])."</td>";
 
 			print "<td align='right' class='text-muted'>";
 			print make_local_datetime($row['created'], false);
@@ -1314,7 +1314,7 @@ 
 	private function encryptAppPassword($password) {
 		$salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
 
-		return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
+		return "SSHA-512:".hash('sha512', $salt.$password).":$salt";
 	}
 
 	public function deleteAppPassword() {

Braces +28 added lines, -16 removed lines

@@ -160,7 +160,9 @@ 
 		$boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
 
 		foreach ($boolean_prefs as $pref) {
-			if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+			if (!isset($_POST[$pref])) {
+				$_POST[$pref] = 'false';
+			}
 		}
 
 		$need_reload = false;
@@ -180,11 +182,15 @@ 
 					}
 					break;
 				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+					if (!$need_reload) {
+						$need_reload = $_SESSION["language"] != $value;
+					}
 					break;
 
 				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+					if (!$need_reload) {
+						$need_reload = get_pref($pref_name) != $value;
+					}
 					break;
 			}
 
@@ -616,8 +622,9 @@ 
 			$pref_name = $line["pref_name"];
 			$short_desc = $this->getShortDesc($pref_name);
 
-			if (!$short_desc)
-				continue;
+			if (!$short_desc) {
+							continue;
+			}
 
 			$prefs_available[$pref_name] = [
 				'type_name' => $line["type_name"],
@@ -669,7 +676,9 @@ 
 						$themes = array_filter($themes, "theme_exists");
 						asort($themes);
 
-						if (!theme_exists($value)) $value = "default.php";
+						if (!theme_exists($value)) {
+							$value = "default.php";
+						}
 
 						print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
 
@@ -728,14 +737,15 @@ 
 							$disabled = "";
 						}
 
-						if ($type_name == 'integer')
-							print "<input dojoType=\"dijit.form.NumberSpinner\"
+						if ($type_name == 'integer') {
+													print "<input dojoType=\"dijit.form.NumberSpinner\"
 								required='1' $disabled
 								name=\"$pref_name\" value=\"$value\">";
-						else
-							print "<input dojoType=\"dijit.form.TextBox\"
+						} else {
+													print "<input dojoType=\"dijit.form.TextBox\"
 								required='1' $regexp $disabled
 								name=\"$pref_name\" value=\"$value\">";
+						}
 
 					} else if ($pref_name == "SSL_CERT_SERIAL") {
 
@@ -770,8 +780,9 @@ 
 						print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
 					}
 
-					if ($item['help_text'])
-						print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+					if ($item['help_text']) {
+											print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+					}
 
 					print "</fieldset>";
 				}
@@ -1108,10 +1119,11 @@ 
 	}
 
 	public function setplugins() {
-		if (is_array(clean($_REQUEST["plugins"])))
-			$plugins = join(",", clean($_REQUEST["plugins"]));
-		else
-			$plugins = "";
+		if (is_array(clean($_REQUEST["plugins"]))) {
+					$plugins = join(",", clean($_REQUEST["plugins"]));
+		} else {
+					$plugins = "";
+		}
 
 		set_pref("_ENABLED_PLUGINS", $plugins);
 	}

classes/pref/filters.php

Spacing +42 added lines, -43 removed lines

@@ -80,14 +80,14 @@ 
 
                     if (strpos($feed_id, "CAT:") === 0) {
                         $cat_id = (int) substr($feed_id, 4);
-                        array_push($scope_inner_qparts, "cat_id = " . $this->pdo->quote($cat_id));
+                        array_push($scope_inner_qparts, "cat_id = ".$this->pdo->quote($cat_id));
                     } else if ($feed_id > 0) {
-                        array_push($scope_inner_qparts, "feed_id = " . $this->pdo->quote($feed_id));
+                        array_push($scope_inner_qparts, "feed_id = ".$this->pdo->quote($feed_id));
                     }
                 }
 
                 if (count($scope_inner_qparts) > 0) {
-				    array_push($scope_qparts, "(" . implode(" OR ", $scope_inner_qparts) . ")");
+				    array_push($scope_qparts, "(".implode(" OR ", $scope_inner_qparts).")");
                 }
 
 				array_push($filter["rules"], $rule);
@@ -100,7 +100,7 @@ 
 
 		if (count($scope_qparts) == 0) $scope_qparts = ["true"];
 
-		$glue = $filter['match_any_rule'] ? " OR " :  " AND ";
+		$glue = $filter['match_any_rule'] ? " OR " : " AND ";
 		$scope_qpart = join($glue, $scope_qparts);
 
 		if (!$scope_qpart) $scope_qpart = "true";
@@ -146,9 +146,9 @@ 
 
 				$content_preview = $line["content_preview"];
 
-				$tmp = "<li><span class='title'>" . $line["title"] . "</span><br/>" .
-					"<span class='feed'>" . $line['feed_title'] . "</span>, <span class='date'>" . mb_substr($line["date_entered"], 0, 16) . "</span>" .
-					"<div class='preview text-muted'>" . $content_preview . "</div>" .
+				$tmp = "<li><span class='title'>".$line["title"]."</span><br/>".
+					"<span class='feed'>".$line['feed_title']."</span>, <span class='date'>".mb_substr($line["date_entered"], 0, 16)."</span>".
+					"<div class='preview text-muted'>".$content_preview."</div>".
 					"</li>";
 
 				array_push($rv, $tmp);
@@ -203,11 +203,11 @@ 
                 foreach ($feeds as $feed_id) {
 
                     if (strpos($feed_id, "CAT:") === 0) {
-                        $feed_id = (int)substr($feed_id, 4);
+                        $feed_id = (int) substr($feed_id, 4);
                         array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
                     } else {
                         if ($feed_id)
-                            array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                            array_push($feeds_fmt, Feeds::getFeedTitle((int) $feed_id));
                         else
                             array_push($feeds_fmt, __("All feeds"));
                     }
@@ -218,8 +218,7 @@ 
             } else {
 
                 $where = $line["cat_filter"] ?
-                    Feeds::getCategoryTitle($line["cat_id"]) :
-                    ($line["feed_id"] ?
+                    Feeds::getCategoryTitle($line["cat_id"]) : ($line["feed_id"] ?
                         Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
             }
 
@@ -227,11 +226,11 @@ 
 
 			$inverse = $line["inverse"] ? "inverse" : "";
 
-			$rv .= "<li class='$inverse'>" . T_sprintf("%s on %s in %s %s",
+			$rv .= "<li class='$inverse'>".T_sprintf("%s on %s in %s %s",
 				htmlspecialchars($line["reg_exp"]),
 				$line["field"],
 				$where,
-				$line["inverse"] ? __("(inverse)") : "") . "</li>";
+				$line["inverse"] ? __("(inverse)") : "")."</li>";
 		}
 
 		return $rv;
@@ -294,12 +293,12 @@ 
 					//$fg_color = $label_row["fg_color"];
 					$bg_color = $label_row["bg_color"];
 
-					$name[1] = "<i class=\"material-icons\" style='color : $bg_color; margin-right : 4px'>label</i>" . $name[1];
+					$name[1] = "<i class=\"material-icons\" style='color : $bg_color; margin-right : 4px'>label</i>".$name[1];
 				}
 			}
 
 			$filter = array();
-			$filter['id'] = 'FILTER:' . $line['id'];
+			$filter['id'] = 'FILTER:'.$line['id'];
 			$filter['bare_id'] = $line['id'];
 			$filter['name'] = $name[0];
 			$filter['param'] = $name[1];
@@ -357,7 +356,7 @@ 
 			print "<div dojoType=\"fox.Toolbar\">";
 
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -384,12 +383,12 @@ 
 					$line["feed_id"] = json_decode($line["match_on"], true);
 				} else {
 					if ($line["cat_filter"]) {
-						$feed_id = "CAT:" . (int)$line["cat_id"];
+						$feed_id = "CAT:".(int) $line["cat_id"];
 					} else {
-						$feed_id = (int)$line["feed_id"];
+						$feed_id = (int) $line["feed_id"];
 					}
 
-					$line["feed_id"] = ["" . $feed_id]; // set item type to string for in_array()
+					$line["feed_id"] = ["".$feed_id]; // set item type to string for in_array()
 				}
 
 				unset($line["cat_filter"]);
@@ -417,7 +416,7 @@ 
 			print "<div dojoType=\"fox.Toolbar\">";
 
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -528,11 +527,11 @@ 
 		foreach ($feeds as $feed_id) {
 
             if (strpos($feed_id, "CAT:") === 0) {
-                $feed_id = (int)substr($feed_id, 4);
+                $feed_id = (int) substr($feed_id, 4);
                 array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
             } else {
                 if ($feed_id)
-                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                    array_push($feeds_fmt, Feeds::getFeedTitle((int) $feed_id));
                 else
                     array_push($feeds_fmt, __("All feeds"));
             }
@@ -542,7 +541,7 @@ 
 
 		$sth = $this->pdo->prepare("SELECT description FROM ttrss_filter_types
 			WHERE id = ?");
-		$sth->execute([(int)$rule["filter_type"]]);
+		$sth->execute([(int) $rule["filter_type"]]);
 
 		if ($row = $sth->fetch()) {
 			$filter_type = $row["description"];
@@ -552,9 +551,9 @@ 
 
 		$inverse = isset($rule["inverse"]) ? "inverse" : "";
 
-		return "<span class='filterRule $inverse'>" .
+		return "<span class='filterRule $inverse'>".
 			T_sprintf("%s on %s in %s %s", htmlspecialchars($rule["reg_exp"]),
-			$filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "") . "</span>";
+			$filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "")."</span>";
 	}
 
 	public function printRuleName() {
@@ -564,7 +563,7 @@ 
 	private function getActionName($action) {
 		$sth = $this->pdo->prepare("SELECT description FROM
 			ttrss_filter_actions WHERE id = ?");
-		$sth->execute([(int)$action["action_id"]]);
+		$sth->execute([(int) $action["action_id"]]);
 
 		$title = "";
 
@@ -574,7 +573,7 @@ 
 
 			if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
 				$action["action_id"] == 7)
-				$title .= ": " . $action["action_param"];
+				$title .= ": ".$action["action_param"];
 
 			if ($action["action_id"] == 9) {
 				list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
@@ -584,7 +583,7 @@ 
 				foreach ($filter_actions as $fclass => $factions) {
 					foreach ($factions as $faction) {
 						if ($pfaction == $faction["action"] && $pfclass == $fclass) {
-							$title .= ": " . $fclass . ": " . $faction["description"];
+							$title .= ": ".$fclass.": ".$faction["description"];
 							break;
 						}
 					}
@@ -681,7 +680,7 @@ 
 					$reg_exp = trim($rule["reg_exp"]);
 					$inverse = isset($rule["inverse"]) ? 1 : 0;
 
-					$filter_type = (int)trim($rule["filter_type"]);
+					$filter_type = (int) trim($rule["filter_type"]);
 					$match_on = json_encode($rule["feed_id"]);
 
 					$rsth->execute([$filter_id, $reg_exp, $filter_type, $match_on, $inverse]);
@@ -695,7 +694,7 @@ 
 			foreach ($actions as $action) {
 				if ($action) {
 
-					$action_id = (int)$action["action_id"];
+					$action_id = (int) $action["action_id"];
 					$action_param = $action["action_param"];
 					$action_param_label = $action["action_param_label"];
 
@@ -704,7 +703,7 @@ 
 					}
 
 					if ($action_id == 6) {
-						$action_param = (int)str_replace("+", "", $action_param);
+						$action_param = (int) str_replace("+", "", $action_param);
 					}
 
 					$asth->execute([$filter_id, $action_id, $action_param]);
@@ -773,7 +772,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('filterTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -859,7 +858,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -888,7 +887,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -992,10 +991,10 @@ 
 		print "</fieldset>";
 
 		print "<fieldset>";
-		print "<label style='display : inline'>".  __("on field") . "</label> ";
+		print "<label style='display : inline'>".__("on field")."</label> ";
 		print_select_hash("filter_type", $filter_type, $filter_types,
 			'dojoType="fox.form.Select"');
-		print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
+		print "<label style='padding-left : 10px; display : inline'>".__("in")."</label> ";
 
 		print "</fieldset>";
 
@@ -1031,7 +1030,7 @@ 
 
 		if ($action) {
 			$action_param = $action["action_param"];
-			$action_id = (int)$action["action_id"];
+			$action_id = (int) $action["action_id"];
 		} else {
 			$action_param = "";
 			$action_id = 0;
@@ -1062,8 +1061,8 @@ 
 		$param_hidden = ($action_id == 4 || $action_id == 6) ?
 			"" : "display : none";
 
-		$label_param_hidden = ($action_id == 7) ?	"" : "display : none";
-		$plugin_param_hidden = ($action_id == 9) ?	"" : "display : none";
+		$label_param_hidden = ($action_id == 7) ? "" : "display : none";
+		$plugin_param_hidden = ($action_id == 9) ? "" : "display : none";
 
 		print "<span id='filterDlg_paramBox' style=\"$param_box_hidden\">";
 		print " ";
@@ -1082,8 +1081,8 @@ 
 		foreach ($filter_actions as $fclass => $factions) {
 			foreach ($factions as $faction) {
 
-				$filter_action_hash[$fclass . ":" . $faction["action"]] =
-					$fclass . ": " . $faction["description"];
+				$filter_action_hash[$fclass.":".$faction["action"]] =
+					$fclass.": ".$faction["description"];
 			}
 		}
 
@@ -1153,8 +1152,8 @@ 
 				$num_actions -= 1;
 			}
 
-			if ($match_any_rule) $title .= " (" . __("matches any rule") . ")";
-			if ($inverse) $title .= " (" . __("inverse") . ")";
+			if ($match_any_rule) $title .= " (".__("matches any rule").")";
+			if ($inverse) $title .= " (".__("inverse").")";
 
 			if ($num_actions > 0)
 				$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);

Braces +52 added lines, -25 removed lines

@@ -21,8 +21,9 @@ 
 		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+		if (!is_array($data['items'])) {
+					$data['items'] = json_decode($data['items'], true);
+		}
 
 		$index = 0;
 
@@ -98,12 +99,16 @@ 
 			}
 		}
 
-		if (count($scope_qparts) == 0) $scope_qparts = ["true"];
+		if (count($scope_qparts) == 0) {
+			$scope_qparts = ["true"];
+		}
 
 		$glue = $filter['match_any_rule'] ? " OR " :  " AND ";
 		$scope_qpart = join($glue, $scope_qparts);
 
-		if (!$scope_qpart) $scope_qpart = "true";
+		if (!$scope_qpart) {
+			$scope_qpart = "true";
+		}
 
 		$rv = array();
 
@@ -161,7 +166,9 @@ 
 
 	public function testFilter() {
 
-		if (isset($_REQUEST["offset"])) return $this->testFilterDo();
+		if (isset($_REQUEST["offset"])) {
+			return $this->testFilterDo();
+		}
 
 		//print __("Articles matching this filter:");
 
@@ -206,10 +213,11 @@ 
                         $feed_id = (int)substr($feed_id, 4);
                         array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
                     } else {
-                        if ($feed_id)
-                            array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
-                        else
-                            array_push($feeds_fmt, __("All feeds"));
+                        if ($feed_id) {
+                                                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                        } else {
+                                                    array_push($feeds_fmt, __("All feeds"));
+                        }
                     }
                 }
 
@@ -396,7 +404,9 @@ 
 				unset($line["cat_id"]);
 				unset($line["filter_id"]);
 				unset($line["id"]);
-				if (!$line["inverse"]) unset($line["inverse"]);
+				if (!$line["inverse"]) {
+					unset($line["inverse"]);
+				}
 				unset($line["match_on"]);
 
 				$data = htmlspecialchars(json_encode($line));
@@ -518,12 +528,16 @@ 
 	}
 
 	private function getRuleName($rule) {
-		if (!$rule) $rule = json_decode(clean($_REQUEST["rule"]), true);
+		if (!$rule) {
+			$rule = json_decode(clean($_REQUEST["rule"]), true);
+		}
 
 		$feeds = $rule["feed_id"];
 		$feeds_fmt = [];
 
-		if (!is_array($feeds)) $feeds = [$feeds];
+		if (!is_array($feeds)) {
+			$feeds = [$feeds];
+		}
 
 		foreach ($feeds as $feed_id) {
 
@@ -531,10 +545,11 @@ 
                 $feed_id = (int)substr($feed_id, 4);
                 array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
             } else {
-                if ($feed_id)
-                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
-                else
-                    array_push($feeds_fmt, __("All feeds"));
+                if ($feed_id) {
+                                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                } else {
+                                    array_push($feeds_fmt, __("All feeds"));
+                }
             }
         }
 
@@ -573,8 +588,9 @@ 
 			$title = __($row["description"]);
 
 			if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
-				$action["action_id"] == 7)
-				$title .= ": " . $action["action_param"];
+				$action["action_id"] == 7) {
+							$title .= ": " . $action["action_param"];
+			}
 
 			if ($action["action_id"] == 9) {
 				list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
@@ -644,8 +660,12 @@ 
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_actions WHERE filter_id = ?");
 		$sth->execute([$filter_id]);
 
-		if (!is_array(clean($_REQUEST["rule"]))) $_REQUEST["rule"] = [];
-		if (!is_array(clean($_REQUEST["action"]))) $_REQUEST["action"] = [];
+		if (!is_array(clean($_REQUEST["rule"]))) {
+			$_REQUEST["rule"] = [];
+		}
+		if (!is_array(clean($_REQUEST["action"]))) {
+			$_REQUEST["action"] = [];
+		}
 
 		if ($filter_id) {
 			/* create rules */
@@ -1137,7 +1157,9 @@ 
 			$match_any_rule = $row["match_any_rule"];
 			$inverse = $row["inverse"];
 
-			if (!$title) $title = __("[No caption]");
+			if (!$title) {
+				$title = __("[No caption]");
+			}
 
 			$title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $num_rules), $title, $num_rules);
 
@@ -1153,11 +1175,16 @@ 
 				$num_actions -= 1;
 			}
 
-			if ($match_any_rule) $title .= " (" . __("matches any rule") . ")";
-			if ($inverse) $title .= " (" . __("inverse") . ")";
+			if ($match_any_rule) {
+				$title .= " (" . __("matches any rule") . ")";
+			}
+			if ($inverse) {
+				$title .= " (" . __("inverse") . ")";
+			}
 
-			if ($num_actions > 0)
-				$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			if ($num_actions > 0) {
+							$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			}
 
 			return [$title, $actions];
 		}