From c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 9 Mar 2017 14:31:54 -0800
Subject: more cleanup

---
 boot.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 36e08c77a..751bee9ec 100755
--- a/boot.php
+++ b/boot.php
@@ -635,11 +635,11 @@ function sys_boot() {
 
 
 	if(! defined('DEFAULT_PLATFORM_ICON')) {
-		define( 'DEFAULT_PLATFORM_ICON', '/images/hz-32.png' );
+		define( 'DEFAULT_PLATFORM_ICON', '/images/rm-32.png' );
 	}
 
 	if(! defined('DEFAULT_NOTIFY_ICON')) {
-		define( 'DEFAULT_NOTIFY_ICON', '/images/hz-white-32.png' );
+		define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
 	}
 
 	if(! defined('CRYPTO_ALGORITHM')) {
-- 
cgit v1.2.3


From 1a49f0d164ce94bc3fce227a68aa3796e22347e1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 9 Mar 2017 18:54:10 -0800
Subject: one role.

---
 boot.php | 47 ++---------------------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 751bee9ec..16d60f61e 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/xchan.php');
 require_once('include/hubloc.php');
 
 
-define ( 'PLATFORM_NAME',           'hubzilla' );
+define ( 'PLATFORM_NAME',           'red' );
 define ( 'STD_VERSION',             '2.3' );
 define ( 'ZOT_REVISION',            '1.2' );
 
@@ -165,14 +165,6 @@ define ( 'LOGGER_DATA',            3 );
 define ( 'LOGGER_ALL',             4 );
 
 
-/**
- * Server roles
- */
-
-define ( 'SERVER_ROLE_BASIC',     0x0001 );
-define ( 'SERVER_ROLE_STANDARD',  0x0002 );
-define ( 'SERVER_ROLE_PRO',       0x0004 );
-
 /**
  * registration policies
  */
@@ -620,15 +612,7 @@ function sys_boot() {
 
 	$a->convert();
 
-	if(defined('UNO')) {
-		if(UNO)
-			App::$config['system']['server_role'] = 'basic';
-		else
-			App::$config['system']['server_role'] = 'standard';
-	}
-
-	if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role']))
-		App::$config['system']['server_role'] = 'standard';
+	App::$config['system']['server_role'] = 'pro';
 
 	App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC');
 	date_default_timezone_set(App::$timezone);
@@ -755,7 +739,6 @@ class miniApp {
 class App {
 
 	public  static $install    = false;           // true if we are installing the software
-	public  static $role       = 0;               // server role (constant, not the string)
 	public  static $account    = null;            // account record of the logged-in account
 	public  static $channel    = null;            // channel record of the current channel of the logged-in account
 	public  static $observer   = null;            // xchan record of the page observer
@@ -1030,36 +1013,10 @@ class App {
 		}
 	}
 
-	public static function get_role() {
-		if(! self::$role)
-			return self::set_role();
-		return self::$role;
-	}
-
-	public static function set_role() {
-		$role_str = \Zotlabs\Lib\System::get_server_role();
-		switch($role_str) {
-			case 'basic':
-				$role = SERVER_ROLE_BASIC;
-				break;
-			case 'pro':
-				$role = SERVER_ROLE_PRO;
-				break;
-			case 'standard':
-			default:
-				$role = SERVER_ROLE_STANDARD;
-				break;
-		}
-		self::$role = $role;
-		return $role;
-	}
-
-
 	public static function get_scheme() {
 		return self::$scheme;
 	}
 
-
 	public static function get_hostname() {
 		return self::$hostname;
 	}
-- 
cgit v1.2.3


From 2a1f6e3df26bf641bbf977deaf3c5f3ac3c64449 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 15:57:56 -0700
Subject: update std_version

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 16d60f61e..83826fd0c 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/hubloc.php');
 
 
 define ( 'PLATFORM_NAME',           'red' );
-define ( 'STD_VERSION',             '2.3' );
+define ( 'STD_VERSION',             '5.2' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1188  );
-- 
cgit v1.2.3


From b1fc29be117cd95ad175a9899d1102ee56471d5b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 16:30:05 -0700
Subject: more cleanup

---
 boot.php | 64 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 83826fd0c..a80bfbed3 100755
--- a/boot.php
+++ b/boot.php
@@ -1130,24 +1130,25 @@ class App {
 		 * since the code added by the modules frequently depends on it
 		 * being first
 		 */
-		$tpl = get_markup_template('head.tpl');
-		self::$page['htmlhead'] = replace_macros($tpl, array(
-			'$preload_images' => $preload_images,
-			'$user_scalable' => $user_scalable,
-			'$query' => urlencode(self::$query_string),
-			'$baseurl' => self::get_baseurl(),
-			'$local_channel' => local_channel(),
-			'$metas' => self::$meta->get(),
-			'$plugins' => $x['header'],
-			'$update_interval' => $interval,
-			'osearch' => sprintf( t('Search %1$s (%2$s)','opensearch'), Zotlabs\Lib\System::get_site_name(), t('$Projectname','opensearch')), 
-			'$head_css' => head_get_css(),
-			'$head_js' => head_get_js(),
-			'$linkrel' => head_get_links(),
-			'$js_strings' => js_strings(),
-			'$zid' => get_my_address(),
-			'$channel_id' => self::$profile['uid'],
-		)) . self::$page['htmlhead'];
+
+		self::$page['htmlhead'] = replace_macros(get_markup_template('head.tpl'), 
+			[
+				'$preload_images'  => $preload_images,
+				'$user_scalable'   => $user_scalable,
+				'$query'           => urlencode(self::$query_string),
+				'$baseurl'         => self::get_baseurl(),
+				'$local_channel'   => local_channel(),
+				'$metas'           => self::$meta->get(),
+				'$plugins'         => $x['header'],
+				'$update_interval' => $interval,
+				'$head_css'        => head_get_css(),
+				'$head_js'         => head_get_js(),
+				'$linkrel'         => head_get_links(),
+				'$js_strings'      => js_strings(),
+				'$zid'             => get_my_address(),
+				'$channel_id'      => self::$profile['uid']
+			]
+		) . self::$page['htmlhead'];
 
 		// always put main.js at the end
 		self::$page['htmlhead'] .= head_get_main_js();
@@ -1160,11 +1161,13 @@ class App {
 	* @param string $name
 	*/
 	public static function register_template_engine($class, $name = '') {
-		if ($name === ""){
-			$v = get_class_vars( $class );
-			if(x($v, "name")) $name = $v['name'];
+		if(! $name) {
+			$v = get_class_vars($class);
+			if(x($v, "name")) { 
+				$name = $v['name'];
+			}
 		}
-		if ($name === ""){
+		if (! $name) {
 			echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
 			killme();
 		}
@@ -1180,19 +1183,21 @@ class App {
 	* @return object Template Engine instance
 	*/
 	public static function template_engine($name = ''){
-		if ($name !== "") {
+		if($name !== '') {
 			$template_engine = $name;
-		} else {
+		}
+		else {
 			$template_engine = 'smarty3';
-			if (x(self::$theme, 'template_engine')) {
+			if(x(self::$theme, 'template_engine')) {
 				$template_engine = self::$theme['template_engine'];
 			}
 		}
 
-		if (isset(self::$template_engines[$template_engine])){
+		if(isset(self::$template_engines[$template_engine])){
 			if(isset(self::$template_engine_instance[$template_engine])){
 				return self::$template_engine_instance[$template_engine];
-			} else {
+			}
+			else {
 				$class = self::$template_engines[$template_engine];
 				$obj = new $class;
 				self::$template_engine_instance[$template_engine] = $obj;
@@ -1200,7 +1205,8 @@ class App {
 			}
 		}
 
-		echo "template engine <tt>$template_engine</tt> is not registered!\n"; killme();
+		echo "template engine <tt>$template_engine</tt> is not registered!\n"; 
+		killme();
 	}
 
 	/**
@@ -2555,7 +2561,7 @@ function check_cron_broken() {
 		'$lastdate' => (($d)? $d : t('never'))
 	));
 
-	$subject = email_header_encode(sprintf(t('[hubzilla] Cron tasks not running on %s'), App::get_hostname()));
+	$subject = email_header_encode(sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()));
 	mail(App::$config['system']['admin_email'], $subject, $email_msg,
 		'From: Administrator' . '@' . App::get_hostname() . "\n"
 		. 'Content-type: text/plain; charset=UTF-8' . "\n"
-- 
cgit v1.2.3


From 58aa0f3e1a52a0c20016a4330100231ad505e6e4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 16:19:47 -0700
Subject: code_allowed is a real mess. Start the cleanup by remving the account
 level code allow and limiting to specific channels only. This reduces the
 possibility of cross channel security issues coming into play. Then provide a
 single function for checking the code permission. This is only partially done
 as we often need to check against the observer or logged in channel as well
 as the resource owner to ensure that this only returns true for local
 channels which also own the requested resource.

---
 boot.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index a80bfbed3..e19ffddb0 100755
--- a/boot.php
+++ b/boot.php
@@ -541,7 +541,6 @@ define ( 'ACCOUNT_PENDING',      0x0010 );
  * Account roles
  */
 
-define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 );
 define ( 'ACCOUNT_ROLE_SYSTEM',    0x0002 );
 define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 );
 define ( 'ACCOUNT_ROLE_ADMIN',     0x1000 );
-- 
cgit v1.2.3


From ab58c95d27e46b0fb37215d4c7b78ab370537cb6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 00:22:57 -0700
Subject: get rid of some cruft in boot.php

---
 boot.php | 79 ++++++++++++++--------------------------------------------------
 1 file changed, 17 insertions(+), 62 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index e19ffddb0..9ebc7e5b6 100755
--- a/boot.php
+++ b/boot.php
@@ -5,14 +5,13 @@
  */
 
 /**
- * Hubzilla.
  *
- * Hubzilla is an open source decentralised communications
+ * This is an open source decentralised communications
  * platform combined with a decentralised identity/authentication framework
  * wrapped in an extensible content management system, providing website designers
  * the ability to embed fully decentralised communications and social tools
  * into many traditional website designs (blogs, forums, small business
- * websites, charitable organisations, etc.). Hubzilla also provides DNS mobility
+ * websites, charitable organisations, etc.). Also provided is DNS mobility
  * and internet scale privacy/access control.
  *
  * This allows any individual website to participate in a matrix of linked
@@ -126,7 +125,9 @@ define ( 'LANGUAGE_DETECT_MIN_CONFIDENCE', 0.01 );
  * either more or less restrictive.
  */
 
-define ( 'STORAGE_DEFAULT_PERMISSIONS',   0770 );
+if(! defined('STORAGE_DEFAULT_PERMISSIONS')) {
+	define ( 'STORAGE_DEFAULT_PERMISSIONS',   0770 );
+}
 
 
 /**
@@ -148,12 +149,6 @@ define ( 'STORAGE_DEFAULT_PERMISSIONS',   0770 );
 define ( 'MAX_IMAGE_LENGTH',        -1  );
 
 
-/**
- * Not yet used
- */
-
-define ( 'DEFAULT_DB_ENGINE',  'MyISAM'  );
-
 /**
  * log levels
  */
@@ -183,15 +178,6 @@ define ( 'ACCESS_PAID',            1 );
 define ( 'ACCESS_FREE',            2 );
 define ( 'ACCESS_TIERED',          3 );
 
-/**
- * relationship types
- */
-
-define ( 'CONTACT_IS_FOLLOWER', 1);
-define ( 'CONTACT_IS_SHARING',  2);
-define ( 'CONTACT_IS_FRIEND',   3);
-
-
 /**
  * DB update return values
  */
@@ -518,14 +504,6 @@ define ( 'ACTIVITY_OBJ_THING',   NAMESPACE_ZOT  . '/activity/thing' );
 define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT  . '/activity/location' );
 define ( 'ACTIVITY_OBJ_FILE',    NAMESPACE_ZOT  . '/activity/file' );
 
-/**
- * item weight for query ordering
- */
-
-define ( 'GRAVITY_PARENT',       0);
-define ( 'GRAVITY_LIKE',         3);
-define ( 'GRAVITY_COMMENT',      6);
-
 /**
  * Account Flags
  */
@@ -550,16 +528,16 @@ define ( 'ACCOUNT_ROLE_ADMIN',     0x1000 );
  */
 
 define ( 'ITEM_VISIBLE',         0x0000);
-//define ( 'ITEM_HIDDEN',          0x0001);
+define ( 'ITEM_HIDDEN',          0x0001);
 define ( 'ITEM_BLOCKED',         0x0002);
 define ( 'ITEM_MODERATED',       0x0004);
 define ( 'ITEM_SPAM',            0x0008);
-//define ( 'ITEM_DELETED',         0x0010);
+define ( 'ITEM_DELETED',         0x0010);
 define ( 'ITEM_UNPUBLISHED',     0x0020);
-//define ( 'ITEM_WEBPAGE',         0x0040);	// is a static web page, not a conversational item
+define ( 'ITEM_WEBPAGE',         0x0040);	// is a static web page, not a conversational item
 define ( 'ITEM_DELAYED_PUBLISH', 0x0080);
 define ( 'ITEM_BUILDBLOCK',      0x0100);	// Named thusly to make sure nobody confuses this with ITEM_BLOCKED
-//define ( 'ITEM_PDL',			 0x0200);	// Page Description Language - e.g. Comanche
+define ( 'ITEM_PDL',			 0x0200);	// Page Description Language - e.g. Comanche
 define ( 'ITEM_BUG',			 0x0400);	// Is a bug, can be used by the internal bug tracker
 define ( 'ITEM_PENDING_REMOVE',  0x0800);   // deleted, notification period has lapsed
 define ( 'ITEM_DOC',             0x1000);   // hubzilla only, define here so that item import does the right thing
@@ -710,6 +688,7 @@ function startup() {
  * which is now static (although currently constructed at startup). We are only converting
  * 'system' config settings.
  */
+
 class miniApp {
 	public $config = array('system' => array());
 
@@ -1785,18 +1764,6 @@ function local_channel() {
 	return false;
 }
 
-/**
- * local_user() got deprecated and replaced by local_channel().
- *
- * @deprecated since v2.1, use local_channel()
- * @see local_channel()
- */
-function local_user() {
-	logger('local_user() is DEPRECATED, use local_channel()');
-	return local_channel();
-}
-
-
 /**
  * @brief Returns a xchan_hash (visitor_id) of remote authenticated visitor
  * or false.
@@ -1818,18 +1785,6 @@ function remote_channel() {
 	return false;
 }
 
-/**
- * remote_user() got deprecated and replaced by remote_channel().
- *
- * @deprecated since v2.1, use remote_channel()
- * @see remote_channel()
- */
-function remote_user() {
-	logger('remote_user() is DEPRECATED, use remote_channel()');
-	return remote_channel();
-}
-
-
 /**
  * Contents of $s are displayed prominently on the page the next time
  * a page is loaded. Usually used for errors or alerts.
@@ -2319,7 +2274,7 @@ function construct_page(&$a) {
 }
 
 /**
- * @brief Returns Hubzilla's root directory.
+ * @brief Returns appplication root directory.
  *
  * @return string
  */
@@ -2335,7 +2290,7 @@ function appdirpath() {
 function head_set_icon($icon) {
 
 	App::$data['pageicon'] = $icon;
-//	logger('head_set_icon: ' . $icon);
+
 }
 
 /**
@@ -2411,10 +2366,10 @@ function z_get_temp_dir() {
 function z_check_cert() {
 
 	if(strpos(z_root(),'https://') !== false) {
-		$x = z_fetch_url(z_root() . '/siteinfo/json');
+		$x = z_fetch_url(z_root() . '/siteinfo.json');
 		if(! $x['success']) {
 			$recurse = 0;
-			$y = z_fetch_url(z_root() . '/siteinfo/json',false,$recurse,array('novalidate' => true));
+			$y = z_fetch_url(z_root() . '/siteinfo.json',false,$recurse,array('novalidate' => true));
 			if($y['success'])
 				cert_bad_email();
 		}
@@ -2425,9 +2380,9 @@ function z_check_cert() {
 /**
  * @brief Send email to admin if server has an invalid certificate.
  *
- * If a Hubzilla hub is available over https it must have a publicly valid
- * certificate.
+ * If a hub is available over https it must have a publicly valid certificate.
  */
+
 function cert_bad_email() {
 
 	$email_tpl = get_intltext_template("cert_bad_eml.tpl");
@@ -2437,7 +2392,7 @@ function cert_bad_email() {
 		'$error' => t('Website SSL certificate is not valid. Please correct.')
 	));
 
-	$subject = email_header_encode(sprintf(t('[hubzilla] Website SSL error for %s'), App::get_hostname()));
+	$subject = email_header_encode(sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()));
 	mail(App::$config['system']['admin_email'], $subject, $email_msg,
 		'From: Administrator' . '@' . App::get_hostname() . "\n"
 		. 'Content-type: text/plain; charset=UTF-8' . "\n"
-- 
cgit v1.2.3


From e98938d03dbdd94c33419924a50e4b6fbeb6fe1c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 23 Mar 2017 00:20:12 -0700
Subject: rev update

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 9ebc7e5b6..e0c0bc94e 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/hubloc.php');
 
 
 define ( 'PLATFORM_NAME',           'red' );
-define ( 'STD_VERSION',             '5.2' );
+define ( 'STD_VERSION',             '5.3' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1188  );
-- 
cgit v1.2.3


From a2e101997836ebd904e94aa896a1bcc2e2c70f01 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 23 Mar 2017 21:49:20 -0700
Subject: move db_upgrade to zlib

---
 boot.php | 90 +++-------------------------------------------------------------
 1 file changed, 3 insertions(+), 87 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index e0c0bc94e..63df8b3b0 100755
--- a/boot.php
+++ b/boot.php
@@ -1357,11 +1357,7 @@ function is_ajax() {
 // base url for use in cmdline programs which don't have
 // $_SERVER variables, and synchronising the state of installed plugins.
 
-function check_config(&$a) {
-
-	$build = get_config('system','db_version');
-	if(! intval($build))
-		$build = set_config('system','db_version',DB_UPDATE_VERSION);
+function check_config() {
 
 	$saved = get_config('system','urlverify');
 	if(! $saved)
@@ -1399,88 +1395,8 @@ function check_config(&$a) {
 	if (! $syschan_exists)
 		create_sys_channel();
 
-	if($build != DB_UPDATE_VERSION) {
-		$stored = intval($build);
-		if(! $stored) {
-			logger('Critical: check_config unable to determine database schema version');
-			return;
-		}
-		$current = intval(DB_UPDATE_VERSION);
-		if(($stored < $current) && file_exists('install/update.php')) {
-
-			load_config('database');
-
-			// We're reporting a different version than what is currently installed.
-			// Run any existing update scripts to bring the database up to current.
-			require_once('install/update.php');
-
-			// make sure that boot.php and update.php are the same release, we might be
-			// updating right this very second and the correct version of the update.php
-			// file may not be here yet. This can happen on a very busy site.
-
-			if(DB_UPDATE_VERSION == UPDATE_VERSION) {
-				for($x = $stored; $x < $current; $x ++) {
-					if(function_exists('update_r' . $x)) {
-						// There could be a lot of processes running or about to run.
-						// We want exactly one process to run the update command.
-						// So store the fact that we're taking responsibility
-						// after first checking to see if somebody else already has.
-
-						// If the update fails or times-out completely you may need to
-						// delete the config entry to try again.
-
-						if(get_config('database','update_r' . $x))
-							break;
-						set_config('database','update_r' . $x, '1');
-						// call the specific update
-
-						$func = 'update_r' . $x;
-						$retval = $func();
-						if($retval) {
-
-							// Prevent sending hundreds of thousands of emails by creating
-							// a lockfile.  
-
-							$lockfile = 'store/[data]/mailsent';
-
-							if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 86400)))
-									return;
-							@unlink($lockfile);
-							//send the administrator an e-mail
-							file_put_contents($lockfile, $x);
-							
-							$r = q("select account_language from account where account_email = '%s' limit 1",
-								dbesc(App::$config['system']['admin_email'])
-							);
-							push_lang(($r) ? $r[0]['account_language'] : 'en');
-
-
-							$email_tpl = get_intltext_template("update_fail_eml.tpl");
-							$email_msg = replace_macros($email_tpl, array(
-								'$sitename' => App::$config['system']['sitename'],
-								'$siteurl' =>  z_root(),
-								'$update' => $x,
-								'$error' => sprintf( t('Update %s failed. See error logs.'), $x)
-							));
-
-							$subject = email_header_encode(sprintf(t('Update Error at %s'), z_root()));
-
-							mail(App::$config['system']['admin_email'], $subject, $email_msg,
-								'From: Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
-								. 'Content-type: text/plain; charset=UTF-8' . "\n"
-								. 'Content-transfer-encoding: 8bit' );
-							//try the logger
-							logger('CRITICAL: Update Failed: ' . $x);
-							pop_lang();
-						}
-						else
-							set_config('database','update_r' . $x, 'success');
-					}
-				}
-				set_config('system','db_version', DB_UPDATE_VERSION);
-			}
-		}
-	}
+	$x = new \Zotlabs\Lib\DB_Upgrade(DB_UPDATE_VERSION);
+
 
 	/**
 	 *
-- 
cgit v1.2.3


From c5828fecc1fadb4db705bbf94edfa7ff873b491a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 16:02:47 -0700
Subject: get rid of get_app()

---
 boot.php | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index f5f25b471..c4f76ddf7 100755
--- a/boot.php
+++ b/boot.php
@@ -1223,18 +1223,6 @@ class App {
 } // End App class
 
 
-/**
- * @brief Retrieve the App structure.
- *
- * Useful in functions which require it but don't get it passed to them
- *
- * @return App
- */
-function get_app() {
-	return $a;
-}
-
-
 /**
  * @brief Multi-purpose function to check variable state.
  *
-- 
cgit v1.2.3


From 046e5e239fd28996f8c658900a83c33dbe0011ba Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 16:07:22 -0700
Subject: remove obsolete app argument from load_pdl

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index c4f76ddf7..2b3e90167 100755
--- a/boot.php
+++ b/boot.php
@@ -1996,7 +1996,7 @@ function get_custom_nav(&$a, $navname) {
  *
  * @param App &$a global application object
  */
-function load_pdl(&$a) {
+function load_pdl() {
 
 	App::$comanche = new Zotlabs\Render\Comanche();
 
-- 
cgit v1.2.3


From 323ab3dba4a925cf2519c5c9eee9b82683dc7d5d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 17:00:44 -0700
Subject: get rid of some more deprecated uses of $a

---
 boot.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 2b3e90167..8a269fbca 100755
--- a/boot.php
+++ b/boot.php
@@ -1982,7 +1982,7 @@ function curPageURL() {
  *
  * @return mixed
  */
-function get_custom_nav(&$a, $navname) {
+function get_custom_nav($navname) {
 	if (! $navname)
 		return App::$page['nav'];
 	// load custom nav menu by name here
@@ -1994,7 +1994,6 @@ function get_custom_nav(&$a, $navname) {
  * If there is no parsed Comanche template already load a module's pdl file
  * and parse it with Comanche.
  *
- * @param App &$a global application object
  */
 function load_pdl() {
 
@@ -2023,7 +2022,7 @@ function load_pdl() {
 }
 
 
-function exec_pdl(&$a) {
+function exec_pdl() {
 	if(App::$pdl) {
 		App::$comanche->parse(App::$pdl,1);
 	}
@@ -2035,11 +2034,10 @@ function exec_pdl(&$a) {
  *
  * Build the page - now that we have all the components
  *
- * @param App &$a global application object
  */
-function construct_page(&$a) {
+function construct_page() {
 
-	exec_pdl($a);
+	exec_pdl();
 
 	$comanche = ((count(App::$layout)) ? true : false);
 
@@ -2055,7 +2053,7 @@ function construct_page(&$a) {
 
 	if ($comanche) {
 		if (App::$layout['nav']) {
-			App::$page['nav'] = get_custom_nav($a, App::$layout['nav']);
+			App::$page['nav'] = get_custom_nav(App::$layout['nav']);
 		}
 	}
 
-- 
cgit v1.2.3


From a54bb07753977c7295929fc207ce80f24cb07baf Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 17:49:48 -0700
Subject: fix a couple more instances where we were still calling mail()
 directly for site critical messages

---
 boot.php | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 8a269fbca..e0fa2fe1a 100755
--- a/boot.php
+++ b/boot.php
@@ -2287,19 +2287,19 @@ function z_check_cert() {
  */
 
 function cert_bad_email() {
-
-	$email_tpl = get_intltext_template("cert_bad_eml.tpl");
-	$email_msg = replace_macros($email_tpl, array(
-		'$sitename' => App::$config['system']['sitename'],
-		'$siteurl' =>  z_root(),
-		'$error' => t('Website SSL certificate is not valid. Please correct.')
-	));
-
-	$subject = email_header_encode(sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()));
-	mail(App::$config['system']['admin_email'], $subject, $email_msg,
-		'From: Administrator' . '@' . App::get_hostname() . "\n"
-		. 'Content-type: text/plain; charset=UTF-8' . "\n"
-		. 'Content-transfer-encoding: 8bit' );
+	return z_mail(
+		[
+			'toEmail'        => \App::$config['system']['admin_email'],
+			'messageSubject' => sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()),
+			'textVersion'    => replace_macros(get_intltext_template('cert_bad_eml.tpl'),
+				[
+					'$sitename' => App::$config['system']['sitename'],
+					'$siteurl'  =>  z_root(),
+					'$error'    => t('Website SSL certificate is not valid. Please correct.')
+				]
+			)
+		]
+	);
 }
 
 
@@ -2410,20 +2410,20 @@ function check_cron_broken() {
 		return;
 	}
 
-	$email_tpl = get_intltext_template("cron_bad_eml.tpl");
-	$email_msg = replace_macros($email_tpl, array(
-		'$sitename' => App::$config['system']['sitename'],
-		'$siteurl' =>  z_root(),
-		'$error' => t('Cron/Scheduled tasks not running.'),
-		'$lastdate' => (($d)? $d : t('never'))
-	));
-
-	$subject = email_header_encode(sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()));
-	mail(App::$config['system']['admin_email'], $subject, $email_msg,
-		'From: Administrator' . '@' . App::get_hostname() . "\n"
-		. 'Content-type: text/plain; charset=UTF-8' . "\n"
-		. 'Content-transfer-encoding: 8bit' );
-	return;
+	return z_mail(
+		[
+			'toEmail'        => \App::$config['system']['admin_email'],
+			'messageSubject' => sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()),
+			'textVersion'    => replace_macros(get_intltext_template('cron_bad_eml.tpl'),
+				[
+					'$sitename' => App::$config['system']['sitename'],
+					'$siteurl'  =>  z_root(),
+					'$error'    => t('Cron/Scheduled tasks not running.'),
+					'$lastdate' => (($d)? $d : t('never'))
+				]
+			)
+		]
+	);
 }
 
 
-- 
cgit v1.2.3


From 810d9e21bcf35c3897718d8eb5a798372656f517 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 1 Apr 2017 15:30:59 -0700
Subject: use aes-ctr which is slightly/arguably better than a poke in the eye
 and don't restrict the crypto algorithm by server role.

---
 boot.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 1c8901f7b..206ba0bc9 100755
--- a/boot.php
+++ b/boot.php
@@ -604,10 +604,6 @@ function sys_boot() {
 		define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
 	}
 
-	if(! defined('CRYPTO_ALGORITHM')) {
-		define( 'CRYPTO_ALGORITHM', 'aes256cbc' );
-	}
-
 	/*
 	 * Try to open the database;
 	 */
@@ -2300,10 +2296,7 @@ function cert_bad_email() {
 			)
 		]
 	);
-<<<<<<< HEAD
 
-=======
->>>>>>> 95f4f14dca1ea982f67cccb31d860f7b8ed9055c
 }
 
 
-- 
cgit v1.2.3


From 1609473e5d1bd9b131e61d41b6123669e7b8885d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 11 Apr 2017 20:17:22 -0700
Subject: correct the mastodon "boost" (aka 'share') author attribution by
 checking for share activities and pulling the original author info from the
 activity:object

---
 boot.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 206ba0bc9..436fcabd9 100755
--- a/boot.php
+++ b/boot.php
@@ -479,6 +479,7 @@ define ( 'ACTIVITY_JOIN',        NAMESPACE_ACTIVITY_SCHEMA . 'join' );
 define ( 'ACTIVITY_POST',        NAMESPACE_ACTIVITY_SCHEMA . 'post' );
 define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
+define ( 'ACTIVITY_SHARE',       NAMESPACE_ACTIVITY_SCHEMA . 'share' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 define ( 'ACTIVITY_CREATE',      NAMESPACE_ACTIVITY_SCHEMA . 'create' );
 define ( 'ACTIVITY_WIN',         NAMESPACE_ACTIVITY_SCHEMA . 'win' );
-- 
cgit v1.2.3


From 1c32564536cbfa12bd21a1c8161921b13d7dcc66 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 17:32:28 -0700
Subject: backend infrastructure for 'channel protection password'; which will
 be used to optionally encrypt export files and resolve channel/identity
 ownership/hijacking disputes

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 436fcabd9..d42d2608a 100755
--- a/boot.php
+++ b/boot.php
@@ -53,7 +53,7 @@ define ( 'STD_VERSION',             '5.3' );
 
 define ( 'ZOT_REVISION',            '1.2' );
 
-define ( 'DB_UPDATE_VERSION',       1188  );
+define ( 'DB_UPDATE_VERSION',       1189  );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
-- 
cgit v1.2.3


From 9c31e26cf1e7a25d287037c65161c4b952e21b19 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Apr 2017 17:54:50 -0700
Subject: include attach.php here (boot.php) instead of each file that uses it.
 Eventually this needs to move to an autoloader.

---
 boot.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 65d198571..b063cd6f9 100755
--- a/boot.php
+++ b/boot.php
@@ -46,6 +46,7 @@ require_once('include/account.php');
 require_once('include/zid.php');
 require_once('include/xchan.php');
 require_once('include/hubloc.php');
+require_once('include/attach.php');
 
 
 define ( 'PLATFORM_NAME',           'red' );
-- 
cgit v1.2.3


From 05cbdc6915cfd5cd814f08596567403cc7e777e7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 3 May 2017 18:30:11 -0700
Subject: cleanup fallback directory list

---
 boot.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 031c1562e..19901aa1d 100755
--- a/boot.php
+++ b/boot.php
@@ -82,7 +82,6 @@ define ( 'DIRECTORY_REALM',            'RED_GLOBAL');
 define ( 'DIRECTORY_FALLBACK_MASTER',  'https://gravizot.de');
 
 $DIRECTORY_FALLBACK_SERVERS = array( 
-	//'https://hubzilla.site',
 	'https://hubzilla.zottel.net',
 	'https://my.federated.social',
 	'https://hubzilla.nl',
-- 
cgit v1.2.3


From 1848a221180d20d7d904a828b8969653a0f319d0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 16 Jun 2017 19:30:02 -0700
Subject: testing mastodon boosts/reshares

---
 boot.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index b9700cdd6..9e1f00d32 100755
--- a/boot.php
+++ b/boot.php
@@ -490,6 +490,7 @@ define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
 define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
+define ( 'ACTIVITY_OBJ_ACTIVITY',NAMESPACE_ACTIVITY_SCHEMA . 'activity' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
 define ( 'ACTIVITY_OBJ_PERSON',  NAMESPACE_ACTIVITY_SCHEMA . 'person' );
 define ( 'ACTIVITY_OBJ_PHOTO',   NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
-- 
cgit v1.2.3