From c3b0c0f32a17649503db67f208cce6f9e0cdc322 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 25 Apr 2016 16:55:33 -0700
Subject: remove global db variable

---
 include/cli_startup.php    |   6 +--
 include/dba/dba_driver.php | 121 +++++++++++++++++++++++++--------------------
 include/network.php        |   2 +-
 include/text.php           |  16 +++---
 4 files changed, 79 insertions(+), 66 deletions(-)

(limited to 'include')

diff --git a/include/cli_startup.php b/include/cli_startup.php
index a99164d4c..a226f1345 100644
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -1,6 +1,7 @@
 <?php /** @file */
 
 require_once('boot.php');
+require_once('include/dba/dba_driver.php');
 
 // Everything we need to boot standalone 'background' processes
 
@@ -14,7 +15,7 @@ function cli_startup() {
 
 	App::init();
   
-	if(is_null($db)) {
+	if(! DBA::$dba) {
 	    @include(".htconfig.php");
 
 		$a->convert();
@@ -25,8 +26,7 @@ function cli_startup() {
 		App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
 		date_default_timezone_set(App::$timezone);
 
-    	require_once('include/dba/dba_driver.php');
-	    $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
+	    $db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
     	unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
   	};
 
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 3c5b0b67e..4bad70323 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -7,44 +7,57 @@
  * functions for working with databases.
  */
 
-/**
- * @brief Returns the database driver object.
- *
- * If available it will use PHP's mysqli otherwise mysql driver.
- *
- * @param string $server DB server name
- * @param string $port DB port
- * @param string $user DB username
- * @param string $pass DB password
- * @param string $db database name
- * @param string $dbtype 0 for mysql, 1 for postgres
- * @param bool $install Defaults to false
- * @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found.
- */
-function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
-	$dba = null;
-
-	$dbtype = intval($dbtype);
-
-	if($dbtype == DBTYPE_POSTGRES) {
-		require_once('include/dba/dba_postgres.php');
-		if(is_null($port)) $port = 5432;
-		$dba = new dba_postgres($server, $port, $user, $pass, $db, $install);
-	} else {
-		if(class_exists('mysqli')) {
-			if (is_null($port)) $port = ini_get("mysqli.default_port");
-			require_once('include/dba/dba_mysqli.php');
-			$dba = new dba_mysqli($server, $port,$user,$pass,$db,$install);
-		} else {
-			if (is_null($port)) $port = "3306";
-			require_once('include/dba/dba_mysql.php');
-			$dba = new dba_mysql($server, $port,$user,$pass,$db,$install);
+
+class DBA {
+
+	static public $dba = null;
+	static public $dbtype = null;
+
+
+	/**
+	 * @brief Returns the database driver object.
+	 *
+	 * If available it will use PHP's mysqli otherwise mysql driver.
+	 *
+	 * @param string $server DB server name
+	 * @param string $port DB port
+	 * @param string $user DB username
+	 * @param string $pass DB password
+	 * @param string $db database name
+	 * @param string $dbtype 0 for mysql, 1 for postgres
+	 * @param bool $install Defaults to false
+	 * @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found.
+	 */
+	
+	function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
+	
+		self::$dba = null;
+
+		self::$dbtype = intval($dbtype);
+
+		if(self::$dbtype == DBTYPE_POSTGRES) {
+			require_once('include/dba/dba_postgres.php');
+			if(is_null($port)) $port = 5432;
+			self::$dba = new dba_postgres($server, $port, $user, $pass, $db, $install);
+		} 
+		else {
+			if(class_exists('mysqli')) {
+				if (is_null($port)) $port = ini_get("mysqli.default_port");
+				require_once('include/dba/dba_mysqli.php');
+				self::$dba = new dba_mysqli($server, $port,$user,$pass,$db,$install);
+			} 
+			else {
+				// UNSUPPORTED, OBSOLETE
+				if (is_null($port)) $port = "3306";
+				require_once('include/dba/dba_mysql.php');
+				self::$dba = new dba_mysql($server, $port,$user,$pass,$db,$install);
+			}
 		}
-	}
 
-	define('NULL_DATE', $dba->get_null_date());
-	define('ACTIVE_DBTYPE', $dbtype);
-	return $dba;
+		define('NULL_DATE', self::$dba->get_null_date());
+		define('ACTIVE_DBTYPE', self::$dbtype);
+		return self::$dba;
+	}
 }
 
 /**
@@ -53,6 +66,7 @@ function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
  * This class gets extended by the real database driver classes, e.g. dba_mysql,
  * dba_mysqli.
  */
+
 abstract class dba_driver {
 	// legacy behavior
 	const INSTALL_SCRIPT='install/schema_mysql.sql';
@@ -203,10 +217,10 @@ function printable($s) {
  * @param int $state 0 to disable debugging
  */
 function dbg($state) {
-	global $db;
+//	global $db;
 
-	if($db)
-		$db->dbg($state);
+	if(DBA::$dba)
+		DBA::$dba->dbg($state);
 }
 
 /**
@@ -220,21 +234,20 @@ function dbg($state) {
  * @return Return an escaped string of the value to pass to a DB query.
  */
 function dbesc($str) {
-	global $db;
-
-	if($db && $db->connected)
-		return($db->escape($str));
+	if(DBA::$dba && DBA::$dba->connected)
+		return(DBA::$dba->escape($str));
 	else
 		return(str_replace("'", "\\'", $str));
 }
+
 function dbescbin($str) {
 	global $db;
-	return $db->escapebin($str);
+	return DBA::$dba->escapebin($str);
 }
 
 function dbunescbin($str) {
 	global $db;
-	return $db->unescapebin($str);
+	return DBA::$dba->unescapebin($str);
 }
 
 function dbescdate($date) {
@@ -248,27 +261,27 @@ function dbescdate($date) {
 
 function db_quoteinterval($txt) {
 	global $db;
-	return $db->quote_interval($txt);
+	return DBA::$dba->quote_interval($txt);
 }
 
 function dbesc_identifier($str) {
 	global $db;
-	return $db->escape_identifier($str);
+	return DBA::$dba->escape_identifier($str);
 }
 
 function db_utcnow() {
 	global $db;
-	return $db->utcnow();
+	return DBA::$dba->utcnow();
 }
 
 function db_optimizetable($table) {
 	global $db;
-	$db->optimize_table($table);
+	DBA::$dba->optimize_table($table);
 }
 
 function db_concat($fld, $sep) {
 	global $db;
-	return $db->concat($fld, $sep);
+	return DBA::$dba->concat($fld, $sep);
 }
 
 // Function: q($sql,$args);
@@ -298,7 +311,7 @@ function q($sql) {
 	$args = func_get_args();
 	unset($args[0]);
 
-	if($db && $db->connected) {
+	if(DBA::$dba && DBA::$dba->connected) {
 		$stmt = vsprintf($sql, $args);
 		if($stmt === false) {
 			if(version_compare(PHP_VERSION, '5.4.0') >= 0)
@@ -307,7 +320,7 @@ function q($sql) {
 			else
 				logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT);
 		}
-		return $db->q($stmt);
+		return DBA::$dba->q($stmt);
 	}
 
 	/*
@@ -329,8 +342,8 @@ function q($sql) {
 function dbq($sql) {
 	global $db;
 
-	if($db && $db->connected)
-		$ret = $db->q($sql);
+	if(DBA::$dba && DBA::$dba->connected)
+		$ret = DBA::$dba->q($sql);
 	else
 		$ret = false;
 
diff --git a/include/network.php b/include/network.php
index ec255581d..f822b644d 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2035,7 +2035,7 @@ function get_site_info() {
 		'admin' => $admin,
 		'site_name' => (($site_name) ? $site_name : ''),
 		'platform' => Zotlabs\Project\System::get_platform_name(),
-		'dbdriver' => $db->getdriver(),
+		'dbdriver' => \DBA::$dba->getdriver(),
 		'lastpoll' => get_config('system','lastpoll'),
 		'info' => (($site_info) ? $site_info : ''),
 		'channels_total' => $channels_total_stat,
diff --git a/include/text.php b/include/text.php
index 0a7f84b01..f27abf80b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -540,11 +540,11 @@ function attribute_contains($attr, $s) {
  */
 
 function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
-	// turn off logger in install mode
-	global $a;
-	global $db;
 
-	if((App::$module == 'install') || (! ($db && $db->connected)))
+	require_once('include/dba/dba_driver.php');
+
+	// turn off logger in install mode
+	if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected)))
 		return;
 
 	$debugging = get_config('system', 'debugging');
@@ -621,11 +621,11 @@ function log_priority_str($priority) {
  * @param int $level A log level.
  */
 function dlogger($msg, $level = 0) {
-	// turn off logger in install mode
-	global $a;
-	global $db;
 
-	if((App::$module == 'install') || (! ($db && $db->connected)))
+	require_once('include/dba/dba_driver.php');
+
+	// turn off logger in install mode
+	if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected)))
 		return;
 
 	$debugging = get_config('system','debugging');
-- 
cgit v1.2.3


From d62f4908146f2bdfb396bff06f74afb62995e4a3 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 25 Apr 2016 20:12:36 -0700
Subject: Setup was horked after this commit and I couldn't easily make it
 right so reverting - will try again at a future date Revert "remove global db
 variable"

This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322.
---
 include/cli_startup.php    |   6 +--
 include/dba/dba_driver.php | 121 ++++++++++++++++++++-------------------------
 include/network.php        |   2 +-
 include/text.php           |  16 +++---
 4 files changed, 66 insertions(+), 79 deletions(-)

(limited to 'include')

diff --git a/include/cli_startup.php b/include/cli_startup.php
index a226f1345..a99164d4c 100644
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -1,7 +1,6 @@
 <?php /** @file */
 
 require_once('boot.php');
-require_once('include/dba/dba_driver.php');
 
 // Everything we need to boot standalone 'background' processes
 
@@ -15,7 +14,7 @@ function cli_startup() {
 
 	App::init();
   
-	if(! DBA::$dba) {
+	if(is_null($db)) {
 	    @include(".htconfig.php");
 
 		$a->convert();
@@ -26,7 +25,8 @@ function cli_startup() {
 		App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
 		date_default_timezone_set(App::$timezone);
 
-	    $db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
+    	require_once('include/dba/dba_driver.php');
+	    $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
     	unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
   	};
 
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 4bad70323..3c5b0b67e 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -7,57 +7,44 @@
  * functions for working with databases.
  */
 
-
-class DBA {
-
-	static public $dba = null;
-	static public $dbtype = null;
-
-
-	/**
-	 * @brief Returns the database driver object.
-	 *
-	 * If available it will use PHP's mysqli otherwise mysql driver.
-	 *
-	 * @param string $server DB server name
-	 * @param string $port DB port
-	 * @param string $user DB username
-	 * @param string $pass DB password
-	 * @param string $db database name
-	 * @param string $dbtype 0 for mysql, 1 for postgres
-	 * @param bool $install Defaults to false
-	 * @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found.
-	 */
-	
-	function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
-	
-		self::$dba = null;
-
-		self::$dbtype = intval($dbtype);
-
-		if(self::$dbtype == DBTYPE_POSTGRES) {
-			require_once('include/dba/dba_postgres.php');
-			if(is_null($port)) $port = 5432;
-			self::$dba = new dba_postgres($server, $port, $user, $pass, $db, $install);
-		} 
-		else {
-			if(class_exists('mysqli')) {
-				if (is_null($port)) $port = ini_get("mysqli.default_port");
-				require_once('include/dba/dba_mysqli.php');
-				self::$dba = new dba_mysqli($server, $port,$user,$pass,$db,$install);
-			} 
-			else {
-				// UNSUPPORTED, OBSOLETE
-				if (is_null($port)) $port = "3306";
-				require_once('include/dba/dba_mysql.php');
-				self::$dba = new dba_mysql($server, $port,$user,$pass,$db,$install);
-			}
+/**
+ * @brief Returns the database driver object.
+ *
+ * If available it will use PHP's mysqli otherwise mysql driver.
+ *
+ * @param string $server DB server name
+ * @param string $port DB port
+ * @param string $user DB username
+ * @param string $pass DB password
+ * @param string $db database name
+ * @param string $dbtype 0 for mysql, 1 for postgres
+ * @param bool $install Defaults to false
+ * @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found.
+ */
+function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
+	$dba = null;
+
+	$dbtype = intval($dbtype);
+
+	if($dbtype == DBTYPE_POSTGRES) {
+		require_once('include/dba/dba_postgres.php');
+		if(is_null($port)) $port = 5432;
+		$dba = new dba_postgres($server, $port, $user, $pass, $db, $install);
+	} else {
+		if(class_exists('mysqli')) {
+			if (is_null($port)) $port = ini_get("mysqli.default_port");
+			require_once('include/dba/dba_mysqli.php');
+			$dba = new dba_mysqli($server, $port,$user,$pass,$db,$install);
+		} else {
+			if (is_null($port)) $port = "3306";
+			require_once('include/dba/dba_mysql.php');
+			$dba = new dba_mysql($server, $port,$user,$pass,$db,$install);
 		}
-
-		define('NULL_DATE', self::$dba->get_null_date());
-		define('ACTIVE_DBTYPE', self::$dbtype);
-		return self::$dba;
 	}
+
+	define('NULL_DATE', $dba->get_null_date());
+	define('ACTIVE_DBTYPE', $dbtype);
+	return $dba;
 }
 
 /**
@@ -66,7 +53,6 @@ class DBA {
  * This class gets extended by the real database driver classes, e.g. dba_mysql,
  * dba_mysqli.
  */
-
 abstract class dba_driver {
 	// legacy behavior
 	const INSTALL_SCRIPT='install/schema_mysql.sql';
@@ -217,10 +203,10 @@ function printable($s) {
  * @param int $state 0 to disable debugging
  */
 function dbg($state) {
-//	global $db;
+	global $db;
 
-	if(DBA::$dba)
-		DBA::$dba->dbg($state);
+	if($db)
+		$db->dbg($state);
 }
 
 /**
@@ -234,20 +220,21 @@ function dbg($state) {
  * @return Return an escaped string of the value to pass to a DB query.
  */
 function dbesc($str) {
-	if(DBA::$dba && DBA::$dba->connected)
-		return(DBA::$dba->escape($str));
+	global $db;
+
+	if($db && $db->connected)
+		return($db->escape($str));
 	else
 		return(str_replace("'", "\\'", $str));
 }
-
 function dbescbin($str) {
 	global $db;
-	return DBA::$dba->escapebin($str);
+	return $db->escapebin($str);
 }
 
 function dbunescbin($str) {
 	global $db;
-	return DBA::$dba->unescapebin($str);
+	return $db->unescapebin($str);
 }
 
 function dbescdate($date) {
@@ -261,27 +248,27 @@ function dbescdate($date) {
 
 function db_quoteinterval($txt) {
 	global $db;
-	return DBA::$dba->quote_interval($txt);
+	return $db->quote_interval($txt);
 }
 
 function dbesc_identifier($str) {
 	global $db;
-	return DBA::$dba->escape_identifier($str);
+	return $db->escape_identifier($str);
 }
 
 function db_utcnow() {
 	global $db;
-	return DBA::$dba->utcnow();
+	return $db->utcnow();
 }
 
 function db_optimizetable($table) {
 	global $db;
-	DBA::$dba->optimize_table($table);
+	$db->optimize_table($table);
 }
 
 function db_concat($fld, $sep) {
 	global $db;
-	return DBA::$dba->concat($fld, $sep);
+	return $db->concat($fld, $sep);
 }
 
 // Function: q($sql,$args);
@@ -311,7 +298,7 @@ function q($sql) {
 	$args = func_get_args();
 	unset($args[0]);
 
-	if(DBA::$dba && DBA::$dba->connected) {
+	if($db && $db->connected) {
 		$stmt = vsprintf($sql, $args);
 		if($stmt === false) {
 			if(version_compare(PHP_VERSION, '5.4.0') >= 0)
@@ -320,7 +307,7 @@ function q($sql) {
 			else
 				logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT);
 		}
-		return DBA::$dba->q($stmt);
+		return $db->q($stmt);
 	}
 
 	/*
@@ -342,8 +329,8 @@ function q($sql) {
 function dbq($sql) {
 	global $db;
 
-	if(DBA::$dba && DBA::$dba->connected)
-		$ret = DBA::$dba->q($sql);
+	if($db && $db->connected)
+		$ret = $db->q($sql);
 	else
 		$ret = false;
 
diff --git a/include/network.php b/include/network.php
index f822b644d..ec255581d 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2035,7 +2035,7 @@ function get_site_info() {
 		'admin' => $admin,
 		'site_name' => (($site_name) ? $site_name : ''),
 		'platform' => Zotlabs\Project\System::get_platform_name(),
-		'dbdriver' => \DBA::$dba->getdriver(),
+		'dbdriver' => $db->getdriver(),
 		'lastpoll' => get_config('system','lastpoll'),
 		'info' => (($site_info) ? $site_info : ''),
 		'channels_total' => $channels_total_stat,
diff --git a/include/text.php b/include/text.php
index f27abf80b..0a7f84b01 100644
--- a/include/text.php
+++ b/include/text.php
@@ -540,11 +540,11 @@ function attribute_contains($attr, $s) {
  */
 
 function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
-
-	require_once('include/dba/dba_driver.php');
-
 	// turn off logger in install mode
-	if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected)))
+	global $a;
+	global $db;
+
+	if((App::$module == 'install') || (! ($db && $db->connected)))
 		return;
 
 	$debugging = get_config('system', 'debugging');
@@ -621,11 +621,11 @@ function log_priority_str($priority) {
  * @param int $level A log level.
  */
 function dlogger($msg, $level = 0) {
-
-	require_once('include/dba/dba_driver.php');
-
 	// turn off logger in install mode
-	if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected)))
+	global $a;
+	global $db;
+
+	if((App::$module == 'install') || (! ($db && $db->connected)))
 		return;
 
 	$debugging = get_config('system','debugging');
-- 
cgit v1.2.3


From 2e7028c976023ebf5c03bfaaad9f91be8a01e932 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 25 Apr 2016 22:03:02 -0700
Subject: some cleanup on the mysqli driver

---
 include/dba/dba_mysqli.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/dba/dba_mysqli.php b/include/dba/dba_mysqli.php
index 6986d4586..57a7559a1 100755
--- a/include/dba/dba_mysqli.php
+++ b/include/dba/dba_mysqli.php
@@ -4,20 +4,26 @@ require_once('include/dba/dba_driver.php');
 
 class dba_mysqli extends dba_driver {
 
-	function connect($server, $port, $user,$pass,$db) {
+	function connect($server,$port,$user,$pass,$db) {
 		if($port)
 			$this->db = new mysqli($server,$user,$pass,$db, $port);
 		else
 			$this->db = new mysqli($server,$user,$pass,$db);
 
-		if(! mysqli_connect_errno()) {
-			$this->connected = true;
+		if($this->db->connect_error) {
+			$this->connected = false;
+			$this->error = $this->db->connect_error;
+
+			if(file_exists('dbfail.out')) {
+				file_put_contents('dbfail.out', datetime_convert() . "\nConnect: " . $this->error . "\n", FILE_APPEND);
+			}
+
+			return false;
 		}
-		if($this->connected) {
+		else {
+			$this->connected = true;
 			return true;
 		}
-		$this->error = $this->db->connect_error;
-		return false;
 	}
 
 	function q($sql) {
-- 
cgit v1.2.3


From 3446e68ac2aa3f970307b748fee5ee2da1af4ca4 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 26 Apr 2016 11:41:08 +0200
Subject: move spoiler= and quote= bbcode handling from prepare_body() to
 bbcode() and add open tag to bbco_autocomplete

---
 include/bbcode.php | 44 ++++++++++++++++++++++++++++----------------
 include/text.php   | 29 -----------------------------
 2 files changed, 28 insertions(+), 45 deletions(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 78a2759c1..b8cd23f59 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -330,8 +330,19 @@ function bb_map_location($match) {
 }
 
 function bb_opentag($match) {
+	$openclose = (($match[2]) ? '<span class="bb-open" title="' . t('Click to open/close') . '">' . $match[1] . '</span>' : t('Click to open/close'));
+	$text = (($match[2]) ? $match[2] : $match[1]);
 	$rnd = mt_rand();
-	return "<br /><div onclick=\"openClose('opendiv-" . $rnd . "');return false;\" class=\"fakelink\">" . $match[1] . "</div><div id=\"opendiv-" . $rnd . "\" style=\"display: none;\">" . $match[2] . "</div>";
+
+	return '<div onclick="openClose(\'opendiv-' . $rnd . '\'); return false;" class="fakelink">' . $openclose . '</div><div id="opendiv-' . $rnd . '" style="display: none;">' . $text . '</div>';
+}
+
+function bb_spoilertag($match) {
+	$openclose = (($match[2]) ? '<span class="bb-spoiler" title="' . t('Click to open/close') . '">' . $match[1] . ' ' . t('spoiler') . '</span>' : t('Click to open/close'));
+	$text = (($match[2]) ? $match[2] : $match[1]);
+	$rnd = mt_rand();
+
+	return '<div onclick="openClose(\'opendiv-' . $rnd . '\'); return false;" class="fakelink">' . $openclose . '</div><blockquote id="opendiv-' . $rnd . '" style="display: none;">' . $text . '</blockquote>';
 }
 
 /**
@@ -748,33 +759,34 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		$Text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $Text);
 	}
 
-	// Declare the format for [spoiler] layout
-	$SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>';
-
 	// Check for [spoiler] text
-	// handle nested quotes
 	$endlessloop = 0;
-	while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20))
-		$Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text);
+	while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) {
+		$Text = preg_replace_callback("/\[spoiler\](.*?)\[\/spoiler\]/ism", 'bb_spoilertag', $Text);
+	}
 
 	// Check for [spoiler=Author] text
-
-	$t_wrote = t('$1 spoiler');
-
-	// handle nested quotes
 	$endlessloop = 0;
-	while ((strpos($Text, "[/spoiler]")!== false)  and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20))
-		$Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
-			"<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
-			$Text);
+	while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) {
+		$Text = preg_replace_callback("/\[spoiler=(.*?)\](.*?)\[\/spoiler\]/ism", 'bb_spoilertag', $Text);
+	}
 
+	// Check for [open] text
+	$endlessloop = 0;
+	while ((strpos($Text, "[/open]")!== false)  and (strpos($Text, "[open]") !== false) and (++$endlessloop < 20)) {
+		$Text = preg_replace_callback("/\[open\](.*?)\[\/open\]/ism", 'bb_opentag', $Text);
+	}
 
+	// Check for [open=Title] text
 	$endlessloop = 0;
 	while ((strpos($Text, "[/open]")!== false)  and (strpos($Text, "[open=") !== false) and (++$endlessloop < 20)) {
 		$Text = preg_replace_callback("/\[open=(.*?)\](.*?)\[\/open\]/ism", 'bb_opentag', $Text);
 	}
 
 
+
+
+
 	// Declare the format for [quote] layout
 	$QuoteLayout = '<blockquote>$1</blockquote>';
 
@@ -792,7 +804,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 	$endlessloop = 0;
 	while ((strpos($Text, "[/quote]")!== false)  and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
 		$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
-			"<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
+			"<span class=".'"bb-quote"'.">" . $t_wrote . "</span><blockquote>$2</blockquote>",
 			$Text);
 
 	// Images
diff --git a/include/text.php b/include/text.php
index 0a7f84b01..926e2eed6 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1532,35 +1532,6 @@ function prepare_body(&$item,$attach = false) {
 
 	$s = sslify($s);
 
-	// Look for spoiler
-	$spoilersearch = '<blockquote class="spoiler">';
-
-	// Remove line breaks before the spoiler
-	while ((strpos($s, "\n".$spoilersearch) !== false))
-		$s = str_replace("\n".$spoilersearch, $spoilersearch, $s);
-	while ((strpos($s, "<br />".$spoilersearch) !== false))
-		$s = str_replace("<br />".$spoilersearch, $spoilersearch, $s);
-
-	while ((strpos($s, $spoilersearch) !== false)) {
-
-		$pos = strpos($s, $spoilersearch);
-		$rnd = random_string(8);
-		$spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
-                                '<blockquote class="spoiler" id="spoiler-'.$rnd.'" style="display: none;">';
-		$s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch));
-	}
-
-	// Look for quote with author
-	$authorsearch = '<blockquote class="author">';
-
-	while ((strpos($s, $authorsearch) !== false)) {
-		$pos = strpos($s, $authorsearch);
-		$rnd = random_string(8);
-		$authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
-                                '<blockquote class="author" id="author-'.$rnd.'" style="display: block;">';
-		$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
-	}
-
 	$prep_arr = array(
 		'item' => $item,
 		'photo' => $photo,
-- 
cgit v1.2.3


From f99daf8ff9b3cd9c0ad61f9fcfec04c6c4042a59 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 26 Apr 2016 16:12:31 -0700
Subject: move iconfig functions to include/config.php with all the rest of the
 configs, fix an issue with singleton discovery and start work on singleton
 delivery

---
 include/config.php  | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/import.php  |   7 ++-
 include/items.php   | 155 ---------------------------------------------------
 include/network.php |   5 +-
 4 files changed, 165 insertions(+), 159 deletions(-)

(limited to 'include')

diff --git a/include/config.php b/include/config.php
index 712b4ca11..12768f4da 100644
--- a/include/config.php
+++ b/include/config.php
@@ -625,3 +625,160 @@ function del_abconfig($chash,$xhash,$family,$key) {
 
 	return $r;
 }
+
+
+
+
+
+
+function get_iconfig(&$item, $family, $key) {
+
+	$is_item = false;
+	if(is_array($item)) {
+		$is_item = true;
+		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
+			$item['iconfig'] = array();
+
+		if(array_key_exists('item_id',$item))
+			$iid = $item['item_id'];
+		else
+			$iid = $item['id'];
+	}
+	elseif(intval($item))
+		$iid = $item;
+
+	if(! $iid)
+		return false;
+
+	if(is_array($item) && array_key_exists('iconfig',$item) && is_array($item['iconfig'])) {
+		foreach($item['iconfig'] as $c) {
+			if($c['iid'] == $iid && $c['cat'] == $family && $c['k'] == $key)
+				return $c['v'];
+		}
+	}
+		 
+	$r = q("select * from iconfig where iid = %d and cat = '%s' and k = '%s' limit 1",
+		intval($iid),
+		dbesc($family),
+		dbesc($key)
+	);
+	if($r) {
+		$r[0]['v'] = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
+		if($is_item)
+			$item['iconfig'][] = $r[0];
+		return $r[0]['v'];
+	}
+	return false;
+
+}
+
+/**
+ * set_iconfig(&$item, $family, $key, $value, $sharing = false);
+ *
+ * $item - item array or item id. If passed an array the iconfig meta information is
+ *    added to the item structure (which will need to be saved with item_store eventually).
+ *    If passed an id, the DB is updated, but may not be federated and/or cloned.
+ * $family - namespace of meta variable
+ * $key - key of meta variable
+ * $value - value of meta variable
+ * $sharing - boolean (default false); if true the meta information is propagated with the item
+ *   to other sites/channels, mostly useful when $item is an array and has not yet been stored/delivered.
+ *   If the meta information is added after delivery and you wish it to be shared, it may be necessary to 
+ *   alter the item edited timestamp and invoke the delivery process on the updated item. The edited 
+ *   timestamp needs to be altered in order to trigger an item_store_update() at the receiving end.
+ */
+ 
+
+function set_iconfig(&$item, $family, $key, $value, $sharing = false) {
+
+	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
+	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+
+	$is_item = false;
+	$idx = null;
+
+	if(is_array($item)) {
+		$is_item = true;
+		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
+			$item['iconfig'] = array();
+		elseif($item['iconfig']) {
+			for($x = 0; $x < count($item['iconfig']); $x ++) {
+				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
+					$idx = $x;
+				}
+			}
+		}
+		$entry = array('cat' => $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing);
+
+		if(is_null($idx))
+			$item['iconfig'][] = $entry;
+		else
+			$item['iconfig'][$idx] = $entry;
+		return $value;
+	}
+
+	if(intval($item))
+		$iid = intval($item);
+
+	if(! $iid)
+		return false;
+
+	if(get_iconfig($item, $family, $key) === false) {
+		$r = q("insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ",
+			intval($iid),
+			dbesc($family),
+			dbesc($key),
+			dbesc($dbvalue),
+			intval($sharing)
+		);
+	}
+	else {
+		$r = q("update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and  k = '%s' ",
+			dbesc($dbvalue),
+			intval($sharing),
+			intval($iid),
+			dbesc($family),
+			dbesc($key)
+		);
+	}
+
+	if(! $r)
+		return false;
+
+	return $value;
+}
+
+
+
+function del_iconfig(&$item, $family, $key) {
+
+
+	$is_item = false;
+	$idx = null;
+
+	if(is_array($item)) {
+		$is_item = true;
+		if(is_array($item['iconfig'])) {
+			for($x = 0; $x < count($item['iconfig']); $x ++) {
+				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
+					unset($item['iconfig'][$x]);
+				}
+			}
+		}
+		return true;
+	}
+
+	if(intval($item))
+		$iid = intval($item);
+
+	if(! $iid)
+		return false;
+
+	return q("delete from iconfig where iid = %d and cat = '%s' and  k = '%s' ",
+		intval($iid),
+		dbesc($family),
+		dbesc($key)
+	);
+
+}
+
diff --git a/include/import.php b/include/import.php
index 3b5c8508c..ae7f417af 100644
--- a/include/import.php
+++ b/include/import.php
@@ -482,7 +482,7 @@ function sync_chatrooms($channel,$chatrooms) {
 
 
 
-function import_items($channel,$items) {
+function import_items($channel,$items,$sync = false) {
 
 	if($channel && $items) {
 		$allow_code = false;
@@ -520,13 +520,16 @@ function import_items($channel,$items) {
 				$item['uid'] = $channel['channel_id'];
 				$item_result = item_store($item,$allow_code,$deliver);
 			}
+			if($sync) {
+				// deliver singletons if we have any
+			}
 		}
 	}
 }
 
 
 function sync_items($channel,$items) {
-	import_items($channel,$items);
+	import_items($channel,$items,true);
 }
 
 
diff --git a/include/items.php b/include/items.php
index 014e626b6..7947f64a2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -5616,158 +5616,3 @@ function send_profile_photo_activity($channel,$photo,$profile) {
 
 }
 
-
-
-
-
-function get_iconfig(&$item, $family, $key) {
-
-	$is_item = false;
-	if(is_array($item)) {
-		$is_item = true;
-		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
-			$item['iconfig'] = array();
-
-		if(array_key_exists('item_id',$item))
-			$iid = $item['item_id'];
-		else
-			$iid = $item['id'];
-	}
-	elseif(intval($item))
-		$iid = $item;
-
-	if(! $iid)
-		return false;
-
-	if(is_array($item) && array_key_exists('iconfig',$item) && is_array($item['iconfig'])) {
-		foreach($item['iconfig'] as $c) {
-			if($c['iid'] == $iid && $c['cat'] == $family && $c['k'] == $key)
-				return $c['v'];
-		}
-	}
-		 
-	$r = q("select * from iconfig where iid = %d and cat = '%s' and k = '%s' limit 1",
-		intval($iid),
-		dbesc($family),
-		dbesc($key)
-	);
-	if($r) {
-		$r[0]['v'] = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
-		if($is_item)
-			$item['iconfig'][] = $r[0];
-		return $r[0]['v'];
-	}
-	return false;
-
-}
-
-/**
- * set_iconfig(&$item, $family, $key, $value, $sharing = false);
- *
- * $item - item array or item id. If passed an array the iconfig meta information is
- *    added to the item structure (which will need to be saved with item_store eventually).
- *    If passed an id, the DB is updated, but may not be federated and/or cloned.
- * $family - namespace of meta variable
- * $key - key of meta variable
- * $value - value of meta variable
- * $sharing - boolean (default false); if true the meta information is propagated with the item
- *   to other sites/channels, mostly useful when $item is an array and has not yet been stored/delivered.
- *   If the meta information is added after delivery and you wish it to be shared, it may be necessary to 
- *   alter the item edited timestamp and invoke the delivery process on the updated item. The edited 
- *   timestamp needs to be altered in order to trigger an item_store_update() at the receiving end.
- */
- 
-
-function set_iconfig(&$item, $family, $key, $value, $sharing = false) {
-
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	$is_item = false;
-	$idx = null;
-
-	if(is_array($item)) {
-		$is_item = true;
-		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
-			$item['iconfig'] = array();
-		elseif($item['iconfig']) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
-				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-					$idx = $x;
-				}
-			}
-		}
-		$entry = array('cat' => $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing);
-
-		if(is_null($idx))
-			$item['iconfig'][] = $entry;
-		else
-			$item['iconfig'][$idx] = $entry;
-		return $value;
-	}
-
-	if(intval($item))
-		$iid = intval($item);
-
-	if(! $iid)
-		return false;
-
-	if(get_iconfig($item, $family, $key) === false) {
-		$r = q("insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ",
-			intval($iid),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue),
-			intval($sharing)
-		);
-	}
-	else {
-		$r = q("update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and  k = '%s' ",
-			dbesc($dbvalue),
-			intval($sharing),
-			intval($iid),
-			dbesc($family),
-			dbesc($key)
-		);
-	}
-
-	if(! $r)
-		return false;
-
-	return $value;
-}
-
-
-
-function del_iconfig(&$item, $family, $key) {
-
-
-	$is_item = false;
-	$idx = null;
-
-	if(is_array($item)) {
-		$is_item = true;
-		if(is_array($item['iconfig'])) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
-				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-					unset($item['iconfig'][$x]);
-				}
-			}
-		}
-		return true;
-	}
-
-	if(intval($item))
-		$iid = intval($item);
-
-	if(! $iid)
-		return false;
-
-	return q("delete from iconfig where iid = %d and cat = '%s' and  k = '%s' ",
-		intval($iid),
-		dbesc($family),
-		dbesc($key)
-	);
-
-}
-
diff --git a/include/network.php b/include/network.php
index ec255581d..395641b73 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2114,8 +2114,9 @@ function check_channelallowed($hash) {
 	return $retvalue;
 }
 
-function deliverable_singleton($xchan) {
-	$r = q("select abook_instance from abook where abook_xchan = '%s' limit 1",
+function deliverable_singleton($channel_id,$xchan) {
+	$r = q("select abook_instance from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
+		intval($channel_id),
 		dbesc($xchan['xchan_hash'])
 	);
 	if($r) {
-- 
cgit v1.2.3


From a67fa2651d3fe4016ba8cc5f0eb90bf3993fb028 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 26 Apr 2016 17:38:44 -0700
Subject: implement the singleton delivery stuff

---
 include/import.php   | 25 ++++++++++++++++++++-----
 include/notifier.php | 19 +++++++++++++++++--
 include/zot.php      |  2 +-
 3 files changed, 38 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/import.php b/include/import.php
index ae7f417af..f6e62f9e0 100644
--- a/include/import.php
+++ b/include/import.php
@@ -499,6 +499,7 @@ function import_items($channel,$items,$sync = false) {
 		$deliver = false;  // Don't deliver any messages or notifications when importing
 
 		foreach($items as $i) {
+			$item_result = false;
 			$item = get_item_elements($i,$allow_code);
 			if(! $item)
 				continue;
@@ -511,7 +512,13 @@ function import_items($channel,$items,$sync = false) {
 				if($item['edited'] > $r[0]['edited']) {
 					$item['id'] = $r[0]['id'];
 					$item['uid'] = $channel['channel_id'];
-					item_store_update($item,$allow_code,$deliver);
+					$item_result = item_store_update($item,$allow_code,$deliver);
+					if($sync && $item['item_wall']) {
+						// deliver singletons if we have any
+						if($item_result && $item_result['success']) {
+							proc_run('php','include/notifier.php','single_activity',$item_result['item_id']);
+						}
+					}
 					continue;
 				}	
 			}
@@ -520,8 +527,11 @@ function import_items($channel,$items,$sync = false) {
 				$item['uid'] = $channel['channel_id'];
 				$item_result = item_store($item,$allow_code,$deliver);
 			}
-			if($sync) {
+			if($sync && $item['item_wall']) {
 				// deliver singletons if we have any
+				if($item_result && $item_result['success']) {
+					proc_run('php','include/notifier.php','single_activity',$item_result['item_id']);
+				}
 			}
 		}
 	}
@@ -842,7 +852,7 @@ function import_conv($channel,$convs) {
 
 
 
-function import_mail($channel,$mails) {
+function import_mail($channel,$mails,$sync = false) {
 	if($channel && $mails) {
 		foreach($mails as $mail) {
 			if(array_key_exists('flags',$mail) && in_array('deleted',$mail['flags'])) {
@@ -866,12 +876,17 @@ function import_mail($channel,$mails) {
 
 			$m['aid'] = $channel['channel_account_id'];
 			$m['uid'] = $channel['channel_id'];
-			mail_store($m);
+			$mail_id = mail_store($m);
+			if($sync && $mail_id) {
+				proc_run('php','include/notifier.php','single_mail',$mail_id);
+			}
  		}
 	}	
 }
 
-
+function sync_mail($channel,$mails) {
+	import_mail($channel,$mails,true);
+}
 
 function sync_files($channel,$files) {
 
diff --git a/include/notifier.php b/include/notifier.php
index 4435c7497..f0c6d7275 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -118,7 +118,7 @@ function notifier_run($argv, $argc){
 	$normal_mode = true;
 	$packet_type = 'undefined';
 
-	if($cmd === 'mail') {
+	if($cmd === 'mail' || $cmd === 'single_mail') {
 		$normal_mode = false;
 		$mail = true;
 		$private = true;
@@ -280,7 +280,7 @@ function notifier_run($argv, $argc){
 			logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
 			return;
 		}
-		if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed'])) {
+		if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || intval($target_item['item_hidden'])) {
 			logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
 			return;
 		}
@@ -454,6 +454,7 @@ function notifier_run($argv, $argc){
 		'uplink' => $uplink,
 		'cmd' => $cmd,
 		'mail' => $mail,
+		'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
 		'location' => $location,
 		'request' => $request,
 		'normal_mode' => $normal_mode,
@@ -550,6 +551,7 @@ function notifier_run($argv, $argc){
 				'uplink' => $uplink,
 				'cmd' => $cmd,
 				'mail' => $mail,
+				'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
 				'location' => $location,
 				'request' => $request,
 				'normal_mode' => $normal_mode,
@@ -568,6 +570,19 @@ function notifier_run($argv, $argc){
 
 		}
 
+		// singleton deliveries by definition 'not got zot'.
+		// Single deliveries are other federated networks (plugins) and we're essentially 
+		// delivering only to those that have this site url in their abook_instance
+		// and only from within a sync operation. This means if you post from a clone,
+		// and a connection is connected to one of your other clones; assuming that hub
+		// is running it will receive a sync packet. On receipt of this sync packet it
+		// will invoke a delivery to those connections which are connected to just that
+		// hub instance. 
+
+		if($cmd === 'single_mail' || $cmd === 'single_activity') {
+			continue;
+		}
+
 		// default: zot protocol
 
 		$hash = random_string();
diff --git a/include/zot.php b/include/zot.php
index 9d9f9ab5f..1ca1b862b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3121,7 +3121,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 			import_conv($channel,$arr['conv']);
 
 		if(array_key_exists('mail',$arr) && $arr['mail'])
-			import_mail($channel,$arr['mail']);
+			sync_mail($channel,$arr['mail']);
 
 		if(array_key_exists('event',$arr) && $arr['event'])
 			sync_events($channel,$arr['event']);
-- 
cgit v1.2.3