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";
+	}
 }

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
 		 */

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) {
 

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) {

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;
 			}
 		}
 

classes/logger.php

Indentation +58 added lines, -58 removed lines

@@ -2,72 +2,72 @@
 
 class Logger {
 
-    /**
-     * @var Logger
-     */
-    private static $instance;
+	/**
+	 * @var Logger
+	 */
+	private static $instance;
 
-    /**
-     * @var bool|Logger_SQL|Logger_Syslog
-     */
-    private $adapter;
+	/**
+	 * @var bool|Logger_SQL|Logger_Syslog
+	 */
+	private $adapter;
 
-    public static $errornames = array(
-        1 => 'E_ERROR',
-        2 => 'E_WARNING',
-        4 => 'E_PARSE',
-        8 => 'E_NOTICE',
-        16 => 'E_CORE_ERROR',
-        32 => 'E_CORE_WARNING',
-        64 => 'E_COMPILE_ERROR',
-        128 => 'E_COMPILE_WARNING',
-        256 => 'E_USER_ERROR',
-        512 => 'E_USER_WARNING',
-        1024 => 'E_USER_NOTICE',
-        2048 => 'E_STRICT',
-        4096 => 'E_RECOVERABLE_ERROR',
-        8192 => 'E_DEPRECATED',
-        16384 => 'E_USER_DEPRECATED',
-        32767 => 'E_ALL');
+	public static $errornames = array(
+		1 => 'E_ERROR',
+		2 => 'E_WARNING',
+		4 => 'E_PARSE',
+		8 => 'E_NOTICE',
+		16 => 'E_CORE_ERROR',
+		32 => 'E_CORE_WARNING',
+		64 => 'E_COMPILE_ERROR',
+		128 => 'E_COMPILE_WARNING',
+		256 => 'E_USER_ERROR',
+		512 => 'E_USER_WARNING',
+		1024 => 'E_USER_NOTICE',
+		2048 => 'E_STRICT',
+		4096 => 'E_RECOVERABLE_ERROR',
+		8192 => 'E_DEPRECATED',
+		16384 => 'E_USER_DEPRECATED',
+		32767 => 'E_ALL');
 
-    public function log_error($errno, $errstr, $file, $line, $context) {
-        if ($errno === E_NOTICE) {
-            return false;
-        }
+	public function log_error($errno, $errstr, $file, $line, $context) {
+		if ($errno === E_NOTICE) {
+			return false;
+		}
 
-        if ($this->adapter) {
-            return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
-        }
+		if ($this->adapter) {
+			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function log($string, $context = "") {
-        if ($this->adapter) {
-            return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
-        }
+	public function log($string, $context = "") {
+		if ($this->adapter) {
+			return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function __construct() {
-        switch (LOG_DESTINATION) {
-            case "sql":
-                $this->adapter = new Logger_SQL();
-                break;
-            case "syslog":
-                $this->adapter = new Logger_Syslog();
-                break;
-            default:
-                $this->adapter = false;
-        }
-    }
+	public function __construct() {
+		switch (LOG_DESTINATION) {
+			case "sql":
+				$this->adapter = new Logger_SQL();
+				break;
+			case "syslog":
+				$this->adapter = new Logger_Syslog();
+				break;
+			default:
+				$this->adapter = false;
+		}
+	}
 
-    public static function get(): Logger {
-        if (self::$instance == null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
+	public static function get(): Logger {
+		if (self::$instance == null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
 
 }

classes/dlg.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 class Dlg extends Handler_Protected {
 	private $param;
-    private $params;
+	private $params;
 
-    function before($method) {
+	function before($method) {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
@@ -108,7 +108,7 @@ 
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
-        if(count($tags) == 0 ){ return; }
+		if(count($tags) == 0 ){ return; }
 
 		ksort($tags);
 
@@ -193,7 +193,7 @@ 
 
 	public function defaultPasswordWarning() {
 
-    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+		print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
 		print "<footer class='text-center'>";
 		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".

include/colors.php

Indentation +304 added lines, -304 removed lines

@@ -1,355 +1,355 @@
 <?php
 
 if (file_exists("lib/floIcon.php")) {
-    require_once "lib/floIcon.php";
+	require_once "lib/floIcon.php";
 }
 
 function _resolve_htmlcolor($color) {
-    $htmlcolors = array(
-        "aliceblue" => "#f0f8ff",
-        "antiquewhite" => "#faebd7",
-        "aqua" => "#00ffff",
-        "aquamarine" => "#7fffd4",
-        "azure" => "#f0ffff",
-        "beige" => "#f5f5dc",
-        "bisque" => "#ffe4c4",
-        "black" => "#000000",
-        "blanchedalmond" => "#ffebcd",
-        "blue" => "#0000ff",
-        "blueviolet" => "#8a2be2",
-        "brown" => "#a52a2a",
-        "burlywood" => "#deb887",
-        "cadetblue" => "#5f9ea0",
-        "chartreuse" => "#7fff00",
-        "chocolate" => "#d2691e",
-        "coral" => "#ff7f50",
-        "cornflowerblue" => "#6495ed",
-        "cornsilk" => "#fff8dc",
-        "crimson" => "#dc143c",
-        "cyan" => "#00ffff",
-        "darkblue" => "#00008b",
-        "darkcyan" => "#008b8b",
-        "darkgoldenrod" => "#b8860b",
-        "darkgray" => "#a9a9a9",
-        "darkgrey" => "#a9a9a9",
-        "darkgreen" => "#006400",
-        "darkkhaki" => "#bdb76b",
-        "darkmagenta" => "#8b008b",
-        "darkolivegreen" => "#556b2f",
-        "darkorange" => "#ff8c00",
-        "darkorchid" => "#9932cc",
-        "darkred" => "#8b0000",
-        "darksalmon" => "#e9967a",
-        "darkseagreen" => "#8fbc8f",
-        "darkslateblue" => "#483d8b",
-        "darkslategray" => "#2f4f4f",
-        "darkslategrey" => "#2f4f4f",
-        "darkturquoise" => "#00ced1",
-        "darkviolet" => "#9400d3",
-        "deeppink" => "#ff1493",
-        "deepskyblue" => "#00bfff",
-        "dimgray" => "#696969",
-        "dimgrey" => "#696969",
-        "dodgerblue" => "#1e90ff",
-        "firebrick" => "#b22222",
-        "floralwhite" => "#fffaf0",
-        "forestgreen" => "#228b22",
-        "fuchsia" => "#ff00ff",
-        "gainsboro" => "#dcdcdc",
-        "ghostwhite" => "#f8f8ff",
-        "gold" => "#ffd700",
-        "goldenrod" => "#daa520",
-        "gray" => "#808080",
-        "grey" => "#808080",
-        "green" => "#008000",
-        "greenyellow" => "#adff2f",
-        "honeydew" => "#f0fff0",
-        "hotpink" => "#ff69b4",
-        "indianred " => "#cd5c5c",
-        "indigo " => "#4b0082",
-        "ivory" => "#fffff0",
-        "khaki" => "#f0e68c",
-        "lavender" => "#e6e6fa",
-        "lavenderblush" => "#fff0f5",
-        "lawngreen" => "#7cfc00",
-        "lemonchiffon" => "#fffacd",
-        "lightblue" => "#add8e6",
-        "lightcoral" => "#f08080",
-        "lightcyan" => "#e0ffff",
-        "lightgoldenrodyellow" => "#fafad2",
-        "lightgray" => "#d3d3d3",
-        "lightgrey" => "#d3d3d3",
-        "lightgreen" => "#90ee90",
-        "lightpink" => "#ffb6c1",
-        "lightsalmon" => "#ffa07a",
-        "lightseagreen" => "#20b2aa",
-        "lightskyblue" => "#87cefa",
-        "lightslategray" => "#778899",
-        "lightslategrey" => "#778899",
-        "lightsteelblue" => "#b0c4de",
-        "lightyellow" => "#ffffe0",
-        "lime" => "#00ff00",
-        "limegreen" => "#32cd32",
-        "linen" => "#faf0e6",
-        "magenta" => "#ff00ff",
-        "maroon" => "#800000",
-        "mediumaquamarine" => "#66cdaa",
-        "mediumblue" => "#0000cd",
-        "mediumorchid" => "#ba55d3",
-        "mediumpurple" => "#9370db",
-        "mediumseagreen" => "#3cb371",
-        "mediumslateblue" => "#7b68ee",
-        "mediumspringgreen" => "#00fa9a",
-        "mediumturquoise" => "#48d1cc",
-        "mediumvioletred" => "#c71585",
-        "midnightblue" => "#191970",
-        "mintcream" => "#f5fffa",
-        "mistyrose" => "#ffe4e1",
-        "moccasin" => "#ffe4b5",
-        "navajowhite" => "#ffdead",
-        "navy" => "#000080",
-        "oldlace" => "#fdf5e6",
-        "olive" => "#808000",
-        "olivedrab" => "#6b8e23",
-        "orange" => "#ffa500",
-        "orangered" => "#ff4500",
-        "orchid" => "#da70d6",
-        "palegoldenrod" => "#eee8aa",
-        "palegreen" => "#98fb98",
-        "paleturquoise" => "#afeeee",
-        "palevioletred" => "#db7093",
-        "papayawhip" => "#ffefd5",
-        "peachpuff" => "#ffdab9",
-        "peru" => "#cd853f",
-        "pink" => "#ffc0cb",
-        "plum" => "#dda0dd",
-        "powderblue" => "#b0e0e6",
-        "purple" => "#800080",
-        "red" => "#ff0000",
-        "rosybrown" => "#bc8f8f",
-        "royalblue" => "#4169e1",
-        "saddlebrown" => "#8b4513",
-        "salmon" => "#fa8072",
-        "sandybrown" => "#f4a460",
-        "seagreen" => "#2e8b57",
-        "seashell" => "#fff5ee",
-        "sienna" => "#a0522d",
-        "silver" => "#c0c0c0",
-        "skyblue" => "#87ceeb",
-        "slateblue" => "#6a5acd",
-        "slategray" => "#708090",
-        "slategrey" => "#708090",
-        "snow" => "#fffafa",
-        "springgreen" => "#00ff7f",
-        "steelblue" => "#4682b4",
-        "tan" => "#d2b48c",
-        "teal" => "#008080",
-        "thistle" => "#d8bfd8",
-        "tomato" => "#ff6347",
-        "turquoise" => "#40e0d0",
-        "violet" => "#ee82ee",
-        "wheat" => "#f5deb3",
-        "white" => "#ffffff",
-        "whitesmoke" => "#f5f5f5",
-        "yellow" => "#ffff00",
-        "yellowgreen" => "#9acd32"
-    );
-
-    $color = strtolower($color);
-
-    if (isset($htmlcolors[$color]))
-        return $htmlcolors[$color];
-    else
-        return $color;
+	$htmlcolors = array(
+		"aliceblue" => "#f0f8ff",
+		"antiquewhite" => "#faebd7",
+		"aqua" => "#00ffff",
+		"aquamarine" => "#7fffd4",
+		"azure" => "#f0ffff",
+		"beige" => "#f5f5dc",
+		"bisque" => "#ffe4c4",
+		"black" => "#000000",
+		"blanchedalmond" => "#ffebcd",
+		"blue" => "#0000ff",
+		"blueviolet" => "#8a2be2",
+		"brown" => "#a52a2a",
+		"burlywood" => "#deb887",
+		"cadetblue" => "#5f9ea0",
+		"chartreuse" => "#7fff00",
+		"chocolate" => "#d2691e",
+		"coral" => "#ff7f50",
+		"cornflowerblue" => "#6495ed",
+		"cornsilk" => "#fff8dc",
+		"crimson" => "#dc143c",
+		"cyan" => "#00ffff",
+		"darkblue" => "#00008b",
+		"darkcyan" => "#008b8b",
+		"darkgoldenrod" => "#b8860b",
+		"darkgray" => "#a9a9a9",
+		"darkgrey" => "#a9a9a9",
+		"darkgreen" => "#006400",
+		"darkkhaki" => "#bdb76b",
+		"darkmagenta" => "#8b008b",
+		"darkolivegreen" => "#556b2f",
+		"darkorange" => "#ff8c00",
+		"darkorchid" => "#9932cc",
+		"darkred" => "#8b0000",
+		"darksalmon" => "#e9967a",
+		"darkseagreen" => "#8fbc8f",
+		"darkslateblue" => "#483d8b",
+		"darkslategray" => "#2f4f4f",
+		"darkslategrey" => "#2f4f4f",
+		"darkturquoise" => "#00ced1",
+		"darkviolet" => "#9400d3",
+		"deeppink" => "#ff1493",
+		"deepskyblue" => "#00bfff",
+		"dimgray" => "#696969",
+		"dimgrey" => "#696969",
+		"dodgerblue" => "#1e90ff",
+		"firebrick" => "#b22222",
+		"floralwhite" => "#fffaf0",
+		"forestgreen" => "#228b22",
+		"fuchsia" => "#ff00ff",
+		"gainsboro" => "#dcdcdc",
+		"ghostwhite" => "#f8f8ff",
+		"gold" => "#ffd700",
+		"goldenrod" => "#daa520",
+		"gray" => "#808080",
+		"grey" => "#808080",
+		"green" => "#008000",
+		"greenyellow" => "#adff2f",
+		"honeydew" => "#f0fff0",
+		"hotpink" => "#ff69b4",
+		"indianred " => "#cd5c5c",
+		"indigo " => "#4b0082",
+		"ivory" => "#fffff0",
+		"khaki" => "#f0e68c",
+		"lavender" => "#e6e6fa",
+		"lavenderblush" => "#fff0f5",
+		"lawngreen" => "#7cfc00",
+		"lemonchiffon" => "#fffacd",
+		"lightblue" => "#add8e6",
+		"lightcoral" => "#f08080",
+		"lightcyan" => "#e0ffff",
+		"lightgoldenrodyellow" => "#fafad2",
+		"lightgray" => "#d3d3d3",
+		"lightgrey" => "#d3d3d3",
+		"lightgreen" => "#90ee90",
+		"lightpink" => "#ffb6c1",
+		"lightsalmon" => "#ffa07a",
+		"lightseagreen" => "#20b2aa",
+		"lightskyblue" => "#87cefa",
+		"lightslategray" => "#778899",
+		"lightslategrey" => "#778899",
+		"lightsteelblue" => "#b0c4de",
+		"lightyellow" => "#ffffe0",
+		"lime" => "#00ff00",
+		"limegreen" => "#32cd32",
+		"linen" => "#faf0e6",
+		"magenta" => "#ff00ff",
+		"maroon" => "#800000",
+		"mediumaquamarine" => "#66cdaa",
+		"mediumblue" => "#0000cd",
+		"mediumorchid" => "#ba55d3",
+		"mediumpurple" => "#9370db",
+		"mediumseagreen" => "#3cb371",
+		"mediumslateblue" => "#7b68ee",
+		"mediumspringgreen" => "#00fa9a",
+		"mediumturquoise" => "#48d1cc",
+		"mediumvioletred" => "#c71585",
+		"midnightblue" => "#191970",
+		"mintcream" => "#f5fffa",
+		"mistyrose" => "#ffe4e1",
+		"moccasin" => "#ffe4b5",
+		"navajowhite" => "#ffdead",
+		"navy" => "#000080",
+		"oldlace" => "#fdf5e6",
+		"olive" => "#808000",
+		"olivedrab" => "#6b8e23",
+		"orange" => "#ffa500",
+		"orangered" => "#ff4500",
+		"orchid" => "#da70d6",
+		"palegoldenrod" => "#eee8aa",
+		"palegreen" => "#98fb98",
+		"paleturquoise" => "#afeeee",
+		"palevioletred" => "#db7093",
+		"papayawhip" => "#ffefd5",
+		"peachpuff" => "#ffdab9",
+		"peru" => "#cd853f",
+		"pink" => "#ffc0cb",
+		"plum" => "#dda0dd",
+		"powderblue" => "#b0e0e6",
+		"purple" => "#800080",
+		"red" => "#ff0000",
+		"rosybrown" => "#bc8f8f",
+		"royalblue" => "#4169e1",
+		"saddlebrown" => "#8b4513",
+		"salmon" => "#fa8072",
+		"sandybrown" => "#f4a460",
+		"seagreen" => "#2e8b57",
+		"seashell" => "#fff5ee",
+		"sienna" => "#a0522d",
+		"silver" => "#c0c0c0",
+		"skyblue" => "#87ceeb",
+		"slateblue" => "#6a5acd",
+		"slategray" => "#708090",
+		"slategrey" => "#708090",
+		"snow" => "#fffafa",
+		"springgreen" => "#00ff7f",
+		"steelblue" => "#4682b4",
+		"tan" => "#d2b48c",
+		"teal" => "#008080",
+		"thistle" => "#d8bfd8",
+		"tomato" => "#ff6347",
+		"turquoise" => "#40e0d0",
+		"violet" => "#ee82ee",
+		"wheat" => "#f5deb3",
+		"white" => "#ffffff",
+		"whitesmoke" => "#f5f5f5",
+		"yellow" => "#ffff00",
+		"yellowgreen" => "#9acd32"
+	);
+
+	$color = strtolower($color);
+
+	if (isset($htmlcolors[$color]))
+		return $htmlcolors[$color];
+	else
+		return $color;
 }
 
 ### RGB >> HSL
 function _color_rgb2hsl($rgb) {
-    $r = $rgb[0]; $g = $rgb[1]; $b = $rgb[2];
-    $min = min($r, min($g, $b)); $max = max($r, max($g, $b));
-    $delta = $max - $min; $l = ($min + $max) / 2; $s = 0;
-    if ($l > 0 && $l < 1) {
-        $s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l));
-    }
-    $h = 0;
-    if ($delta > 0) {
-        if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-        if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-        if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
-        $h /= 6;
-    } return array($h, $s, $l);
+	$r = $rgb[0]; $g = $rgb[1]; $b = $rgb[2];
+	$min = min($r, min($g, $b)); $max = max($r, max($g, $b));
+	$delta = $max - $min; $l = ($min + $max) / 2; $s = 0;
+	if ($l > 0 && $l < 1) {
+		$s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l));
+	}
+	$h = 0;
+	if ($delta > 0) {
+		if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
+		if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
+		if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+		$h /= 6;
+	} return array($h, $s, $l);
 }
 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
-    $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
-    $m1 = $l * 2 - $m2;
-    return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
-        _color_hue2rgb($m1, $m2, $h),
-        _color_hue2rgb($m1, $m2, $h - 0.33333));
+	$h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
+	$m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+	$m1 = $l * 2 - $m2;
+	return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
+		_color_hue2rgb($m1, $m2, $h),
+		_color_hue2rgb($m1, $m2, $h - 0.33333));
 }
 
 ### Helper function for _color_hsl2rgb().
 function _color_hue2rgb($m1, $m2, $h) {
-    $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-    if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-    if ($h * 2 < 1) return $m2;
-    if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
-    return $m1;
+	$h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
+	if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
+	if ($h * 2 < 1) return $m2;
+	if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+	return $m1;
 }
 
 ### Convert a hex color into an RGB triplet.
 function _color_unpack($hex, $normalize = false) {
 
-    if (strpos($hex, '#') !== 0)
-        $hex = _resolve_htmlcolor($hex);
-    else
-        $hex = substr($hex, 1);
-
-    if (strlen($hex) == 4) {
-        $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
-    }
-    $c = hexdec($hex);
-    for ($i = 16; $i >= 0; $i -= 8) {
-        $out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
-    } return $out;
+	if (strpos($hex, '#') !== 0)
+		$hex = _resolve_htmlcolor($hex);
+	else
+		$hex = substr($hex, 1);
+
+	if (strlen($hex) == 4) {
+		$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+	}
+	$c = hexdec($hex);
+	for ($i = 16; $i >= 0; $i -= 8) {
+		$out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
+	} return $out;
 }
 
 ### Convert an RGB triplet to a hex color.
 function _color_pack($rgb, $normalize = false) {
-    foreach ($rgb as $k => $v) {
-        $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-    }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+	foreach ($rgb as $k => $v) {
+		$out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
+	}return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
-    $r = $arr[0];
-    $g = $arr[1];
-    $b = $arr[2];
+	$r = $arr[0];
+	$g = $arr[1];
+	$b = $arr[2];
 
-    $var_R = ($r / 255);
-    $var_G = ($g / 255);
-    $var_B = ($b / 255);
+	$var_R = ($r / 255);
+	$var_G = ($g / 255);
+	$var_B = ($b / 255);
 
-    $var_Min = min($var_R, $var_G, $var_B);
-    $var_Max = max($var_R, $var_G, $var_B);
-    $del_Max = $var_Max - $var_Min;
+	$var_Min = min($var_R, $var_G, $var_B);
+	$var_Max = max($var_R, $var_G, $var_B);
+	$del_Max = $var_Max - $var_Min;
 
-    $v = $var_Max;
+	$v = $var_Max;
 
-    if ($del_Max == 0) {
-        $h = 0;
-        $s = 0;
-    } else {
-        $s = $del_Max / $var_Max;
+	if ($del_Max == 0) {
+		$h = 0;
+		$s = 0;
+	} else {
+		$s = $del_Max / $var_Max;
 
-        $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+		if      ($var_R == $var_Max) $h = $del_B - $del_G;
+		else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
+		else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
 
-        if ($h < 0) $h++;
-        if ($h > 1) $h--;
-    }
+		if ($h < 0) $h++;
+		if ($h > 1) $h--;
+	}
 
-    return array($h, $s, $v);
+	return array($h, $s, $v);
 }
 
 function hsl2rgb($arr) {
-    $h = $arr[0];
-    $s = $arr[1];
-    $v = $arr[2];
-
-    if($s == 0) {
-        $r = $g = $B = $v * 255;
-    } else {
-        $var_H = $h * 6;
-        $var_i = floor($var_H );
-        $var_1 = $v * (1 - $s );
-        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
-
-        $r = $var_R * 255;
-        $g = $var_G * 255;
-        $B = $var_B * 255;
-    }
-    return array($r, $g, $B);
+	$h = $arr[0];
+	$s = $arr[1];
+	$v = $arr[2];
+
+	if($s == 0) {
+		$r = $g = $B = $v * 255;
+	} else {
+		$var_H = $h * 6;
+		$var_i = floor($var_H );
+		$var_1 = $v * (1 - $s );
+		$var_2 = $v * (1 - $s * ($var_H - $var_i ) );
+		$var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
+
+		if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
+		else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
+		else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
+		else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
+		else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
+		else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+
+		$r = $var_R * 255;
+		$g = $var_G * 255;
+		$B = $var_B * 255;
+	}
+	return array($r, $g, $B);
 }
 
 function colorPalette($imageFile, $numColors, $granularity = 5) {
-    $granularity = max(1, abs((int)$granularity));
-    $colors = array();
-
-    $size = @getimagesize($imageFile);
-
-    // to enable .ico support place floIcon.php into lib/
-    if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
-
-        if (class_exists("floIcon")) {
-
-            $ico = new floIcon();
-            @$ico->readICO($imageFile);
-
-            if(count($ico->images)==0)
-                return false;
-            else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
-
-        } else {
-            return false;
-        }
-
-    } else if ($size[0] > 0 && $size[1] > 0) {
-        $img = @imagecreatefromstring(file_get_contents($imageFile));
-    }
-
-    if (!$img) return false;
-
-    for($x = 0; $x < $size[0]; $x += $granularity) {
-        for($y = 0; $y < $size[1]; $y += $granularity) {
-            $thisColor = imagecolorat($img, $x, $y);
-            $rgb = imagecolorsforindex($img, $thisColor);
-            $red = round(round(($rgb['red'] / 0x33)) * 0x33);
-            $green = round(round(($rgb['green'] / 0x33)) * 0x33);
-            $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
-            $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-            if(array_key_exists($thisRGB, $colors)) {
-                $colors[$thisRGB]++;
-            } else{
-                $colors[$thisRGB] = 1;
-            }
-        }
-    }
-
-    arsort($colors);
-    return array_slice(array_keys($colors), 0, $numColors);
+	$granularity = max(1, abs((int)$granularity));
+	$colors = array();
+
+	$size = @getimagesize($imageFile);
+
+	// to enable .ico support place floIcon.php into lib/
+	if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+
+		if (class_exists("floIcon")) {
+
+			$ico = new floIcon();
+			@$ico->readICO($imageFile);
+
+			if(count($ico->images)==0)
+				return false;
+			else
+				$img = @$ico->images[count($ico->images)-1]->getImageResource();
+
+		} else {
+			return false;
+		}
+
+	} else if ($size[0] > 0 && $size[1] > 0) {
+		$img = @imagecreatefromstring(file_get_contents($imageFile));
+	}
+
+	if (!$img) return false;
+
+	for($x = 0; $x < $size[0]; $x += $granularity) {
+		for($y = 0; $y < $size[1]; $y += $granularity) {
+			$thisColor = imagecolorat($img, $x, $y);
+			$rgb = imagecolorsforindex($img, $thisColor);
+			$red = round(round(($rgb['red'] / 0x33)) * 0x33);
+			$green = round(round(($rgb['green'] / 0x33)) * 0x33);
+			$blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
+			$thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
+			if(array_key_exists($thisRGB, $colors)) {
+				$colors[$thisRGB]++;
+			} else{
+				$colors[$thisRGB] = 1;
+			}
+		}
+	}
+
+	arsort($colors);
+	return array_slice(array_keys($colors), 0, $numColors);
 }
 
 function calculate_avg_color($iconFile) {
-    $palette = colorPalette($iconFile, 4, 4);
+	$palette = colorPalette($iconFile, 4, 4);
 
-    if (is_array($palette)) {
-        foreach ($palette as $p) {
-            $hsl = rgb2hsl(_color_unpack("#$p"));
+	if (is_array($palette)) {
+		foreach ($palette as $p) {
+			$hsl = rgb2hsl(_color_unpack("#$p"));
 
-            if ($hsl[1] > 0.25 && $hsl[2] > 0.25 &&
-                !($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[1] < 0.01) &&
-                !($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[2] > 0.99)) {
+			if ($hsl[1] > 0.25 && $hsl[2] > 0.25 &&
+				!($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[1] < 0.01) &&
+				!($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[2] > 0.99)) {
 
-                return _color_pack(hsl2rgb($hsl));
-            }
-        }
-    }
-    return '';
+				return _color_pack(hsl2rgb($hsl));
+			}
+		}
+	}
+	return '';
 }

include/db-prefs.php

Indentation +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 require_once "db.php";
 
 function get_pref($pref_name, $user_id = false, $die_on_error = false) {
-    return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
+	return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
 }
 
 function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
-    return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
+	return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
 }