From 9afecaaffee60250f141527eff9d279ff48b4140 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 5 Jun 2016 20:16:33 -0700
Subject: We need a laugh icon more than we need a cry icon.

---
 Zotlabs/Lib/ThreadItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index e55931f40..f724ac95d 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -15,7 +15,7 @@ class ThreadItem {
 	private $comment_box_template = 'comment_item.tpl';
 	private $commentable = false;
 	// list of supported reaction emojis - a site can over-ride this via config system.reactions
-	private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f622','1f62e','1f634','1f61c','1f607','1f608'];
+	private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f606','1f62e','1f634','1f61c','1f607','1f608'];
 	private $toplevel = false;
 	private $children = array();
 	private $parent = null;
-- 
cgit v1.2.3


From adecd2960e2b7cdca8a23e5c4e8d80645407b513 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 5 Jun 2016 22:18:17 -0700
Subject: move pconfig to static class

---
 Zotlabs/Lib/PConfig.php | 189 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 Zotlabs/Lib/PConfig.php

(limited to 'Zotlabs')

diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
new file mode 100644
index 000000000..0cd65392e
--- /dev/null
+++ b/Zotlabs/Lib/PConfig.php
@@ -0,0 +1,189 @@
+<?php /** @file */
+
+namespace Zotlabs\Lib;
+
+
+class PConfig {
+
+	/**
+	 * @brief Loads all configuration values of a channel into a cached storage.
+	 *
+	 * All configuration values of the given channel are stored in global cache
+	 * which is available under the global variable App::$config[$uid].
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @return void|false Nothing or false if $uid is false
+	 */
+
+	static public function Load($uid) {
+		if($uid === false)
+			return false;
+
+		if(! array_key_exists($uid, \App::$config))
+			\App::$config[$uid] = array();
+
+		$r = q("SELECT * FROM pconfig WHERE uid = %d",
+			intval($uid)
+		);
+
+		if($r) {
+			foreach($r as $rr) {
+				$k = $rr['k'];
+				$c = $rr['cat'];
+				if(! array_key_exists($c, \App::$config[$uid])) {
+					\App::$config[$uid][$c] = array();
+					\App::$config[$uid][$c]['config_loaded'] = true;
+				}
+				\App::$config[$uid][$c][$k] = $rr['v'];
+			}
+		}
+	}
+
+	/**
+	 * @brief Get a particular channel's config variable given the category name
+	 * ($family) and a key.
+	 *
+	 * Get a particular channel's config value from the given category ($family)
+	 * and the $key from a cached storage in App::$config[$uid].
+	 *
+	 * Returns false if not set.
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to query
+	 * @param boolean $instore (deprecated, without function)
+	 * @return mixed Stored value or false if it does not exist
+	 */
+
+	static public function Get($uid,$family,$key,$instore = false) {
+
+		if($uid === false)
+			return false;
+
+		if(! array_key_exists($uid, \App::$config))
+			load_pconfig($uid);
+
+		if((! array_key_exists($family, \App::$config[$uid])) || (! array_key_exists($key, \App::$config[$uid][$family])))
+			return false;
+
+		return ((! is_array(\App::$config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', \App::$config[$uid][$family][$key])) 
+			? unserialize(\App::$config[$uid][$family][$key])
+			: \App::$config[$uid][$family][$key]
+		);
+
+	}
+
+	/**
+	 * @brief Sets a configuration value for a channel.
+	 *
+	 * Stores a config value ($value) in the category ($family) under the key ($key)
+	 * for the channel_id $uid.
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to set
+	 * @param string $value
+	 *  The value to store
+	 * @return mixed Stored $value or false
+	 */
+
+	static public function Set($uid, $family, $key, $value) {
+
+		// this catches subtle errors where this function has been called 
+		// with local_channel() when not logged in (which returns false)
+		// and throws an error in array_key_exists below. 
+		// we provide a function backtrace in the logs so that we can find
+		// and fix the calling function.
+
+		if($uid === false) {
+			btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
+			return;
+		}
+
+		// manage array value
+		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
+		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+
+		if(get_pconfig($uid, $family, $key) === false) {
+			if(! array_key_exists($uid, \App::$config))
+				\App::$config[$uid] = array();
+			if(! array_key_exists($family, \App::$config[$uid]))
+				\App::$config[$uid][$family] = array();
+
+			$ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
+				intval($uid),
+				dbesc($family),
+				dbesc($key),
+				dbesc($dbvalue)
+			);
+
+		}
+		else {
+
+			$ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
+				dbesc($dbvalue),
+				intval($uid),
+				dbesc($family),
+				dbesc($key)
+			);
+
+		}
+
+		// keep a separate copy for all variables which were
+		// set in the life of this page. We need this to
+		// synchronise channel clones.
+
+		if(! array_key_exists('transient', \App::$config[$uid]))
+			\App::$config[$uid]['transient'] = array();
+		if(! array_key_exists($family, \App::$config[$uid]['transient']))
+			\App::$config[$uid]['transient'][$family] = array();
+
+		\App::$config[$uid][$family][$key] = $value;
+		\App::$config[$uid]['transient'][$family][$key] = $value;
+
+		if($ret)
+			return $value;
+
+		return $ret;
+	}
+
+
+	/**
+	 * @brief Deletes the given key from the channel's configuration.
+	 *
+	 * Removes the configured value from the stored cache in App::$config[$uid]
+	 * and removes it from the database.
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to delete
+	 * @return mixed
+	 */
+ 
+	static public function Delete($uid, $family, $key) {
+
+		$ret = false;
+
+		if(array_key_exists($key, \App::$config[$uid][$family]))
+			unset(\App::$config[$uid][$family][$key]);
+			$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
+				intval($uid),
+				dbesc($family),
+				dbesc($key)
+			);
+
+		return $ret;
+	}
+
+}
+		
\ No newline at end of file
-- 
cgit v1.2.3